Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
ea8dfe64
Commit
ea8dfe64
authored
Jul 20, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 20, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Convert some uppercase hex constants to lowercase.
parent
15b41f01
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
30 additions
and
29 deletions
+30
-29
device.c
dlls/wined3d/device.c
+1
-1
directx.c
dlls/wined3d/directx.c
+2
-2
state.c
dlls/wined3d/state.c
+2
-2
stateblock.c
dlls/wined3d/stateblock.c
+1
-1
surface.c
dlls/wined3d/surface.c
+8
-8
vertexdeclaration.c
dlls/wined3d/vertexdeclaration.c
+1
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+15
-14
No files found.
dlls/wined3d/device.c
View file @
ea8dfe64
...
...
@@ -3337,7 +3337,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO
warned
=
TRUE
;
}
*
(
(
DWORD
*
)
dest_ptr
)
=
0xFF
000000
;
*
(
DWORD
*
)
dest_ptr
=
0xff
000000
;
dest_ptr
+=
sizeof
(
DWORD
);
}
else
...
...
dlls/wined3d/directx.c
View file @
ea8dfe64
...
...
@@ -4914,8 +4914,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
WINED3DVTXPCAPS_VERTEXFOG
|
WINED3DVTXPCAPS_TEXGEN
;
caps
->
MaxPrimitiveCount
=
0x
FFFFF
;
/* For now set 2^20-1 which is used by most >=Geforce3/Radeon8500 cards */
caps
->
MaxVertexIndex
=
0x
FFFFF
;
caps
->
MaxPrimitiveCount
=
0x
fffff
;
/* For now set 2^20-1 which is used by most >=Geforce3/Radeon8500 cards */
caps
->
MaxVertexIndex
=
0x
fffff
;
caps
->
MaxStreams
=
MAX_STREAMS
;
caps
->
MaxStreamStride
=
1024
;
...
...
dlls/wined3d/state.c
View file @
ea8dfe64
...
...
@@ -586,7 +586,7 @@ static void shaderconstant(struct wined3d_context *context, const struct wined3d
static
void
state_clipping
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
{
DWORD
enable
=
0x
FFFFFFFF
;
DWORD
enable
=
0x
ffffffff
;
DWORD
disable
=
0x00000000
;
if
(
use_vs
(
state
))
...
...
@@ -3819,7 +3819,7 @@ static void transform_worldex(struct wined3d_context *context, const struct wine
* GL_MODELVIEW2_ARB: 0x8722
* GL_MODELVIEW3_ARB: 0x8723
* etc
* GL_MODELVIEW31_ARB: 0x873
F
* GL_MODELVIEW31_ARB: 0x873
f
*/
if
(
matrix
==
1
)
glMat
=
GL_MODELVIEW1_ARB
;
else
glMat
=
GL_MODELVIEW2_ARB
-
2
+
matrix
;
...
...
dlls/wined3d/stateblock.c
View file @
ea8dfe64
...
...
@@ -1228,7 +1228,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock)
state
->
render_states
[
WINED3D_RS_COLORWRITEENABLE1
]
=
0x0000000f
;
state
->
render_states
[
WINED3D_RS_COLORWRITEENABLE2
]
=
0x0000000f
;
state
->
render_states
[
WINED3D_RS_COLORWRITEENABLE3
]
=
0x0000000f
;
state
->
render_states
[
WINED3D_RS_BLENDFACTOR
]
=
0x
FFFFFFFF
;
state
->
render_states
[
WINED3D_RS_BLENDFACTOR
]
=
0x
ffffffff
;
state
->
render_states
[
WINED3D_RS_SRGBWRITEENABLE
]
=
0
;
state
->
render_states
[
WINED3D_RS_DEPTHBIAS
]
=
0
;
state
->
render_states
[
WINED3D_RS_WRAP8
]
=
0
;
...
...
dlls/wined3d/surface.c
View file @
ea8dfe64
...
...
@@ -3820,9 +3820,9 @@ do { \
BYTE
*
d
=
buf
;
for
(
x
=
0
;
x
<
width
;
++
x
,
d
+=
3
)
{
d
[
0
]
=
(
color
)
&
0x
FF
;
d
[
1
]
=
(
color
>>
8
)
&
0x
FF
;
d
[
2
]
=
(
color
>>
16
)
&
0x
FF
;
d
[
0
]
=
(
color
)
&
0x
ff
;
d
[
1
]
=
(
color
>>
8
)
&
0x
ff
;
d
[
2
]
=
(
color
>>
16
)
&
0x
ff
;
}
break
;
}
...
...
@@ -4635,7 +4635,7 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25
else
if
(
pal
->
flags
&
WINEDDPCAPS_ALPHA
)
table
[
i
][
3
]
=
pal
->
palents
[
i
].
peFlags
;
else
table
[
i
][
3
]
=
0x
FF
;
table
[
i
][
3
]
=
0x
ff
;
}
}
}
...
...
@@ -4704,7 +4704,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI
Dest
=
(
WORD
*
)
(
dst
+
y
*
outpitch
);
for
(
x
=
0
;
x
<
width
;
x
++
)
{
WORD
color
=
*
Source
++
;
*
Dest
=
((
color
&
0x
FFC0
)
|
((
color
&
0x1F
)
<<
1
));
*
Dest
=
((
color
&
0x
ffc0
)
|
((
color
&
0x1f
)
<<
1
));
if
(
!
color_in_range
(
&
surface
->
src_blt_color_key
,
color
))
*
Dest
|=
0x0001
;
Dest
++
;
...
...
@@ -6757,7 +6757,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
case
BLACKNESS
:
hr
=
_Blt_ColorFill
(
dbuf
,
dstwidth
,
dstheight
,
bpp
,
dst_map
.
row_pitch
,
0
);
break
;
case
0x
AA
0029
:
/* No-op */
case
0x
aa
0029
:
/* No-op */
break
;
case
WHITENESS
:
hr
=
_Blt_ColorFill
(
dbuf
,
dstwidth
,
dstheight
,
bpp
,
dst_map
.
row_pitch
,
~
0U
);
...
...
@@ -6916,8 +6916,8 @@ do { \
else
{
LONG
dstyinc
=
dst_map
.
row_pitch
,
dstxinc
=
bpp
;
DWORD
keylow
=
0x
FFFFFFFF
,
keyhigh
=
0
,
keymask
=
0xFFFFFFFF
;
DWORD
destkeylow
=
0x0
,
destkeyhigh
=
0x
FFFFFFFF
,
destkeymask
=
0xFFFFFFFF
;
DWORD
keylow
=
0x
ffffffff
,
keyhigh
=
0
,
keymask
=
0xffffffff
;
DWORD
destkeylow
=
0x0
,
destkeyhigh
=
0x
ffffffff
,
destkeymask
=
0xffffffff
;
if
(
flags
&
(
WINEDDBLT_KEYSRC
|
WINEDDBLT_KEYDEST
|
WINEDDBLT_KEYSRCOVERRIDE
|
WINEDDBLT_KEYDESTOVERRIDE
))
{
/* The color keying flags are checked for correctness in ddraw */
...
...
dlls/wined3d/vertexdeclaration.c
View file @
ea8dfe64
...
...
@@ -315,7 +315,7 @@ static unsigned int convert_fvf_to_declaration(const struct wined3d_gl_info *gl_
BOOL
has_specular
=
!!
(
fvf
&
WINED3DFVF_SPECULAR
);
DWORD
num_textures
=
(
fvf
&
WINED3DFVF_TEXCOUNT_MASK
)
>>
WINED3DFVF_TEXCOUNT_SHIFT
;
DWORD
texcoords
=
(
fvf
&
0x
FFFF
0000
)
>>
16
;
DWORD
texcoords
=
(
fvf
&
0x
ffff
0000
)
>>
16
;
struct
wined3d_fvf_convert_state
state
;
unsigned
int
size
;
unsigned
int
idx
;
...
...
dlls/wined3d/wined3d_private.h
View file @
ea8dfe64
...
...
@@ -187,10 +187,11 @@ static inline GLenum wined3d_gl_min_mip_filter(const struct min_lookup min_mip_l
*
* See GL_NV_half_float for a reference of the FLOAT16 / GL_HALF format
*/
static
inline
float
float_16_to_32
(
const
unsigned
short
*
in
)
{
static
inline
float
float_16_to_32
(
const
unsigned
short
*
in
)
{
const
unsigned
short
s
=
((
*
in
)
&
0x8000
);
const
unsigned
short
e
=
((
*
in
)
&
0x7
C
00
)
>>
10
;
const
unsigned
short
m
=
(
*
in
)
&
0x3
FF
;
const
unsigned
short
e
=
((
*
in
)
&
0x7
c
00
)
>>
10
;
const
unsigned
short
m
=
(
*
in
)
&
0x3
ff
;
const
float
sgn
=
(
s
?
-
1
.
0
f
:
1
.
0
f
);
if
(
e
==
0
)
{
...
...
@@ -800,15 +801,15 @@ extern int num_lock DECLSPEC_HIDDEN;
/* ------------------ */
#define GL_EXTCALL(f) (gl_info->f)
#define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0x
FF
)
#define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0x
FF
)
#define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0x
FF
)
#define D3DCOLOR_B_A(dw) (((dw) >> 24) & 0x
FF
)
#define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0x
ff
)
#define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0x
ff
)
#define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0x
ff
)
#define D3DCOLOR_B_A(dw) (((dw) >> 24) & 0x
ff
)
#define D3DCOLOR_R(dw) (((float) (((dw) >> 16) & 0x
FF
)) / 255.0f)
#define D3DCOLOR_G(dw) (((float) (((dw) >> 8) & 0x
FF
)) / 255.0f)
#define D3DCOLOR_B(dw) (((float) (((dw) >> 0) & 0x
FF
)) / 255.0f)
#define D3DCOLOR_A(dw) (((float) (((dw) >> 24) & 0x
FF
)) / 255.0f)
#define D3DCOLOR_R(dw) (((float) (((dw) >> 16) & 0x
ff
)) / 255.0f)
#define D3DCOLOR_G(dw) (((float) (((dw) >> 8) & 0x
ff
)) / 255.0f)
#define D3DCOLOR_B(dw) (((float) (((dw) >> 0) & 0x
ff
)) / 255.0f)
#define D3DCOLOR_A(dw) (((float) (((dw) >> 24) & 0x
ff
)) / 255.0f)
#define D3DCOLORTOGLFLOAT4(dw, vec) do { \
(vec)[0] = D3DCOLOR_R(dw); \
...
...
@@ -1329,10 +1330,10 @@ enum wined3d_pci_device
CARD_AMD_RADEON_HD6550D
=
0x9640
,
CARD_AMD_RADEON_HD6600
=
0x6758
,
CARD_AMD_RADEON_HD6600M
=
0x6741
,
CARD_AMD_RADEON_HD6700
=
0x68
BA
,
CARD_AMD_RADEON_HD6700
=
0x68
ba
,
CARD_AMD_RADEON_HD6800
=
0x6739
,
CARD_AMD_RADEON_HD6900
=
0x6719
,
CARD_AMD_RADEON_HD7900
=
0x679
A
,
CARD_AMD_RADEON_HD7900
=
0x679
a
,
CARD_NVIDIA_RIVA_128
=
0x0018
,
CARD_NVIDIA_RIVA_TNT
=
0x0020
,
...
...
@@ -1353,7 +1354,7 @@ enum wined3d_pci_device
CARD_NVIDIA_GEFORCE_7300
=
0x01d7
,
/* GeForce Go 7300 */
CARD_NVIDIA_GEFORCE_7600
=
0x0391
,
CARD_NVIDIA_GEFORCE_7800GT
=
0x0092
,
CARD_NVIDIA_GEFORCE_8200
=
0x0849
,
/* Other PCI ID 0x084
B
*/
CARD_NVIDIA_GEFORCE_8200
=
0x0849
,
/* Other PCI ID 0x084
b
*/
CARD_NVIDIA_GEFORCE_8300GS
=
0x0423
,
CARD_NVIDIA_GEFORCE_8400GS
=
0x0404
,
CARD_NVIDIA_GEFORCE_8500GT
=
0x0421
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment