ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Convert some uppercase hex constants to lowercase.

This commit is contained in:
Henri Verbeet 2012-07-20 00:24:27 +02:00 committed by Alexandre Julliard
parent 15b41f0181
commit ea8dfe640d
7 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/device.c
View File

@ -3337,7 +3337,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO
warned = TRUE; warned = TRUE;
} }
*( (DWORD *) dest_ptr) = 0xFF000000; *(DWORD *)dest_ptr = 0xff000000;
dest_ptr += sizeof(DWORD); dest_ptr += sizeof(DWORD);
} }
else else

4
dlls/wined3d/directx.c
View File

@ -4914,8 +4914,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
WINED3DVTXPCAPS_VERTEXFOG | WINED3DVTXPCAPS_VERTEXFOG |
WINED3DVTXPCAPS_TEXGEN; WINED3DVTXPCAPS_TEXGEN;
caps->MaxPrimitiveCount = 0xFFFFF; /* For now set 2^20-1 which is used by most >=Geforce3/Radeon8500 cards */ caps->MaxPrimitiveCount = 0xfffff; /* For now set 2^20-1 which is used by most >=Geforce3/Radeon8500 cards */
caps->MaxVertexIndex = 0xFFFFF; caps->MaxVertexIndex = 0xfffff;
caps->MaxStreams = MAX_STREAMS; caps->MaxStreams = MAX_STREAMS;
caps->MaxStreamStride = 1024; caps->MaxStreamStride = 1024;

4
dlls/wined3d/state.c
View File

@ -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) static void state_clipping(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{ {
DWORD enable = 0xFFFFFFFF; DWORD enable = 0xffffffff;
DWORD disable = 0x00000000; DWORD disable = 0x00000000;
if (use_vs(state)) if (use_vs(state))
@ -3819,7 +3819,7 @@ static void transform_worldex(struct wined3d_context *context, const struct wine
* GL_MODELVIEW2_ARB: 0x8722 * GL_MODELVIEW2_ARB: 0x8722
* GL_MODELVIEW3_ARB: 0x8723 * GL_MODELVIEW3_ARB: 0x8723
* etc * etc
* GL_MODELVIEW31_ARB: 0x873F * GL_MODELVIEW31_ARB: 0x873f
*/ */
if(matrix == 1) glMat = GL_MODELVIEW1_ARB; if(matrix == 1) glMat = GL_MODELVIEW1_ARB;
else glMat = GL_MODELVIEW2_ARB - 2 + matrix; else glMat = GL_MODELVIEW2_ARB - 2 + matrix;

2
dlls/wined3d/stateblock.c
View File

@ -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_COLORWRITEENABLE1] = 0x0000000f;
state->render_states[WINED3D_RS_COLORWRITEENABLE2] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE2] = 0x0000000f;
state->render_states[WINED3D_RS_COLORWRITEENABLE3] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE3] = 0x0000000f;
state->render_states[WINED3D_RS_BLENDFACTOR] = 0xFFFFFFFF; state->render_states[WINED3D_RS_BLENDFACTOR] = 0xffffffff;
state->render_states[WINED3D_RS_SRGBWRITEENABLE] = 0; state->render_states[WINED3D_RS_SRGBWRITEENABLE] = 0;
state->render_states[WINED3D_RS_DEPTHBIAS] = 0; state->render_states[WINED3D_RS_DEPTHBIAS] = 0;
state->render_states[WINED3D_RS_WRAP8] = 0; state->render_states[WINED3D_RS_WRAP8] = 0;

16
dlls/wined3d/surface.c
View File

@ -3820,9 +3820,9 @@ do { \
BYTE *d = buf; BYTE *d = buf;
for (x = 0; x < width; ++x, d += 3) for (x = 0; x < width; ++x, d += 3)
{ {
d[0] = (color ) & 0xFF; d[0] = (color ) & 0xff;
d[1] = (color >> 8) & 0xFF; d[1] = (color >> 8) & 0xff;
d[2] = (color >> 16) & 0xFF; d[2] = (color >> 16) & 0xff;
} }
break; break;
} }
@ -4635,7 +4635,7 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25
else if (pal->flags & WINEDDPCAPS_ALPHA) else if (pal->flags & WINEDDPCAPS_ALPHA)
table[i][3] = pal->palents[i].peFlags; table[i][3] = pal->palents[i].peFlags;
else else
table[i][3] = 0xFF; table[i][3] = 0xff;
} }
} }
} }
@ -4704,7 +4704,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI
Dest = (WORD *) (dst + y * outpitch); Dest = (WORD *) (dst + y * outpitch);
for (x = 0; x < width; x++ ) { for (x = 0; x < width; x++ ) {
WORD color = *Source++; WORD color = *Source++;
*Dest = ((color & 0xFFC0) | ((color & 0x1F) << 1)); *Dest = ((color & 0xffc0) | ((color & 0x1f) << 1));
if (!color_in_range(&surface->src_blt_color_key, color)) if (!color_in_range(&surface->src_blt_color_key, color))
*Dest |= 0x0001; *Dest |= 0x0001;
Dest++; Dest++;
@ -6757,7 +6757,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
case BLACKNESS: case BLACKNESS:
hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, 0); hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, 0);
break; break;
case 0xAA0029: /* No-op */ case 0xaa0029: /* No-op */
break; break;
case WHITENESS: case WHITENESS:
hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, ~0U); hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, ~0U);
@ -6916,8 +6916,8 @@ do { \
else else
{ {
LONG dstyinc = dst_map.row_pitch, dstxinc = bpp; LONG dstyinc = dst_map.row_pitch, dstxinc = bpp;
DWORD keylow = 0xFFFFFFFF, keyhigh = 0, keymask = 0xFFFFFFFF; DWORD keylow = 0xffffffff, keyhigh = 0, keymask = 0xffffffff;
DWORD destkeylow = 0x0, destkeyhigh = 0xFFFFFFFF, destkeymask = 0xFFFFFFFF; DWORD destkeylow = 0x0, destkeyhigh = 0xffffffff, destkeymask = 0xffffffff;
if (flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYDEST | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_KEYDESTOVERRIDE)) if (flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYDEST | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_KEYDESTOVERRIDE))
{ {
/* The color keying flags are checked for correctness in ddraw */ /* The color keying flags are checked for correctness in ddraw */

2
dlls/wined3d/vertexdeclaration.c
View File

@ -315,7 +315,7 @@ static unsigned int convert_fvf_to_declaration(const struct wined3d_gl_info *gl_
BOOL has_specular = !!(fvf & WINED3DFVF_SPECULAR); BOOL has_specular = !!(fvf & WINED3DFVF_SPECULAR);
DWORD num_textures = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; DWORD num_textures = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT;
DWORD texcoords = (fvf & 0xFFFF0000) >> 16; DWORD texcoords = (fvf & 0xffff0000) >> 16;
struct wined3d_fvf_convert_state state; struct wined3d_fvf_convert_state state;
unsigned int size; unsigned int size;
unsigned int idx; unsigned int idx;

29
dlls/wined3d/wined3d_private.h
View File

@ -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 * 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 s = ((*in) & 0x8000);
const unsigned short e = ((*in) & 0x7C00) >> 10; const unsigned short e = ((*in) & 0x7c00) >> 10;
const unsigned short m = (*in) & 0x3FF; const unsigned short m = (*in) & 0x3ff;
const float sgn = (s ? -1.0f : 1.0f); const float sgn = (s ? -1.0f : 1.0f);
if(e == 0) { if(e == 0) {
@ -800,15 +801,15 @@ extern int num_lock DECLSPEC_HIDDEN;
/* ------------------ */ /* ------------------ */
#define GL_EXTCALL(f) (gl_info->f) #define GL_EXTCALL(f) (gl_info->f)
#define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xFF) #define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xff)
#define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xFF) #define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xff)
#define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0xFF) #define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0xff)
#define D3DCOLOR_B_A(dw) (((dw) >> 24) & 0xFF) #define D3DCOLOR_B_A(dw) (((dw) >> 24) & 0xff)
#define D3DCOLOR_R(dw) (((float) (((dw) >> 16) & 0xFF)) / 255.0f) #define D3DCOLOR_R(dw) (((float) (((dw) >> 16) & 0xff)) / 255.0f)
#define D3DCOLOR_G(dw) (((float) (((dw) >> 8) & 0xFF)) / 255.0f) #define D3DCOLOR_G(dw) (((float) (((dw) >> 8) & 0xff)) / 255.0f)
#define D3DCOLOR_B(dw) (((float) (((dw) >> 0) & 0xFF)) / 255.0f) #define D3DCOLOR_B(dw) (((float) (((dw) >> 0) & 0xff)) / 255.0f)
#define D3DCOLOR_A(dw) (((float) (((dw) >> 24) & 0xFF)) / 255.0f) #define D3DCOLOR_A(dw) (((float) (((dw) >> 24) & 0xff)) / 255.0f)
#define D3DCOLORTOGLFLOAT4(dw, vec) do { \ #define D3DCOLORTOGLFLOAT4(dw, vec) do { \
(vec)[0] = D3DCOLOR_R(dw); \ (vec)[0] = D3DCOLOR_R(dw); \
@ -1329,10 +1330,10 @@ enum wined3d_pci_device
CARD_AMD_RADEON_HD6550D = 0x9640, CARD_AMD_RADEON_HD6550D = 0x9640,
CARD_AMD_RADEON_HD6600 = 0x6758, CARD_AMD_RADEON_HD6600 = 0x6758,
CARD_AMD_RADEON_HD6600M = 0x6741, CARD_AMD_RADEON_HD6600M = 0x6741,
CARD_AMD_RADEON_HD6700 = 0x68BA, CARD_AMD_RADEON_HD6700 = 0x68ba,
CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6800 = 0x6739,
CARD_AMD_RADEON_HD6900 = 0x6719, CARD_AMD_RADEON_HD6900 = 0x6719,
CARD_AMD_RADEON_HD7900 = 0x679A, CARD_AMD_RADEON_HD7900 = 0x679a,
CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_128 = 0x0018,
CARD_NVIDIA_RIVA_TNT = 0x0020, CARD_NVIDIA_RIVA_TNT = 0x0020,
@ -1353,7 +1354,7 @@ enum wined3d_pci_device
CARD_NVIDIA_GEFORCE_7300 = 0x01d7, /* GeForce Go 7300 */ CARD_NVIDIA_GEFORCE_7300 = 0x01d7, /* GeForce Go 7300 */
CARD_NVIDIA_GEFORCE_7600 = 0x0391, CARD_NVIDIA_GEFORCE_7600 = 0x0391,
CARD_NVIDIA_GEFORCE_7800GT = 0x0092, CARD_NVIDIA_GEFORCE_7800GT = 0x0092,
CARD_NVIDIA_GEFORCE_8200 = 0x0849, /* Other PCI ID 0x084B */ CARD_NVIDIA_GEFORCE_8200 = 0x0849, /* Other PCI ID 0x084b */
CARD_NVIDIA_GEFORCE_8300GS = 0x0423, CARD_NVIDIA_GEFORCE_8300GS = 0x0423,
CARD_NVIDIA_GEFORCE_8400GS = 0x0404, CARD_NVIDIA_GEFORCE_8400GS = 0x0404,
CARD_NVIDIA_GEFORCE_8500GT = 0x0421, CARD_NVIDIA_GEFORCE_8500GT = 0x0421,