October 2006 - Wine-Commits

Ivan Gyurdiev : wined3d: Add D3DTEXTURETRANSFORMTYPE to the WINED3D namespace.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: 9846602412ad38356d46541f4b0251192b9d36c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9846602412ad38356d46541f4… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 23:36:09 2006 -0400 wined3d: Add D3DTEXTURETRANSFORMTYPE to the WINED3D namespace. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/cubetexture.c | 4 +++- dlls/wined3d/drawprim.c | 30 +++++++++++++++--------------- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 20 ++++++++++---------- include/wine/wined3d_types.h | 11 +++++++++++ 8 files changed, 43 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9846602412ad38356d465…

1 0

Ivan Gyurdiev : wined3d: Add D3DCLIPPLANE constants to the WINED3D namespace.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: 4745e602d2936c8f81f02d01a0ceeb3b6ef6dda8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4745e602d2936c8f81f02d01a… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 23:35:35 2006 -0400 wined3d: Add D3DCLIPPLANE constants to the WINED3D namespace. --- dlls/wined3d/device.c | 26 +++++++++++++------------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 4 +--- include/wine/wined3d_types.h | 8 ++++++++ 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ee966b0..ab94a1e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3687,19 +3687,19 @@ static HRESULT WINAPI IWineD3DDeviceImpl disable = ~Value & OldValue; } - if (enable & D3DCLIPPLANE0) { glEnable(GL_CLIP_PLANE0); checkGLcall("glEnable(clip plane 0)"); } - if (enable & D3DCLIPPLANE1) { glEnable(GL_CLIP_PLANE1); checkGLcall("glEnable(clip plane 1)"); } - if (enable & D3DCLIPPLANE2) { glEnable(GL_CLIP_PLANE2); checkGLcall("glEnable(clip plane 2)"); } - if (enable & D3DCLIPPLANE3) { glEnable(GL_CLIP_PLANE3); checkGLcall("glEnable(clip plane 3)"); } - if (enable & D3DCLIPPLANE4) { glEnable(GL_CLIP_PLANE4); checkGLcall("glEnable(clip plane 4)"); } - if (enable & D3DCLIPPLANE5) { glEnable(GL_CLIP_PLANE5); checkGLcall("glEnable(clip plane 5)"); } - - if (disable & D3DCLIPPLANE0) { glDisable(GL_CLIP_PLANE0); checkGLcall("glDisable(clip plane 0)"); } - if (disable & D3DCLIPPLANE1) { glDisable(GL_CLIP_PLANE1); checkGLcall("glDisable(clip plane 1)"); } - if (disable & D3DCLIPPLANE2) { glDisable(GL_CLIP_PLANE2); checkGLcall("glDisable(clip plane 2)"); } - if (disable & D3DCLIPPLANE3) { glDisable(GL_CLIP_PLANE3); checkGLcall("glDisable(clip plane 3)"); } - if (disable & D3DCLIPPLANE4) { glDisable(GL_CLIP_PLANE4); checkGLcall("glDisable(clip plane 4)"); } - if (disable & D3DCLIPPLANE5) { glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); } + if (enable & WINED3DCLIPPLANE0) { glEnable(GL_CLIP_PLANE0); checkGLcall("glEnable(clip plane 0)"); } + if (enable & WINED3DCLIPPLANE1) { glEnable(GL_CLIP_PLANE1); checkGLcall("glEnable(clip plane 1)"); } + if (enable & WINED3DCLIPPLANE2) { glEnable(GL_CLIP_PLANE2); checkGLcall("glEnable(clip plane 2)"); } + if (enable & WINED3DCLIPPLANE3) { glEnable(GL_CLIP_PLANE3); checkGLcall("glEnable(clip plane 3)"); } + if (enable & WINED3DCLIPPLANE4) { glEnable(GL_CLIP_PLANE4); checkGLcall("glEnable(clip plane 4)"); } + if (enable & WINED3DCLIPPLANE5) { glEnable(GL_CLIP_PLANE5); checkGLcall("glEnable(clip plane 5)"); } + + if (disable & WINED3DCLIPPLANE0) { glDisable(GL_CLIP_PLANE0); checkGLcall("glDisable(clip plane 0)"); } + if (disable & WINED3DCLIPPLANE1) { glDisable(GL_CLIP_PLANE1); checkGLcall("glDisable(clip plane 1)"); } + if (disable & WINED3DCLIPPLANE2) { glDisable(GL_CLIP_PLANE2); checkGLcall("glDisable(clip plane 2)"); } + if (disable & WINED3DCLIPPLANE3) { glDisable(GL_CLIP_PLANE3); checkGLcall("glDisable(clip plane 3)"); } + if (disable & WINED3DCLIPPLANE4) { glDisable(GL_CLIP_PLANE4); checkGLcall("glDisable(clip plane 4)"); } + if (disable & WINED3DCLIPPLANE5) { glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); } /** update clipping status */ if (enable) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9494b38..a5fd74a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -489,7 +489,7 @@ #undef USE_GL_FUNC /* Retrieve opengl defaults */ glGetIntegerv(GL_MAX_CLIP_PLANES, &gl_max); - gl_info->max_clipplanes = min(D3DMAXUSERCLIPPLANES, gl_max); + gl_info->max_clipplanes = min(WINED3DMAXUSERCLIPPLANES, gl_max); TRACE_(d3d_caps)("ClipPlanes support - num Planes=%d\n", gl_max); glGetIntegerv(GL_MAX_LIGHTS, &gl_max); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60a934a..abdd1f0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -51,7 +51,7 @@ #define MAX_STREAMS 16 #define MAX_TEXTURES 8 #define MAX_SAMPLERS 16 #define MAX_ACTIVE_LIGHTS 8 -#define MAX_CLIPPLANES D3DMAXUSERCLIPPLANES +#define MAX_CLIPPLANES WINED3DMAXUSERCLIPPLANES #define MAX_LEVELS 256 #define MAX_CONST_I 16 @@ -221,8 +221,6 @@ #define MAX_STREAMS 16 /* Maximum poss /* Maximum number of constants provided to the shaders */ #define HIGHEST_TRANSFORMSTATE 512 /* Highest value in WINED3DTRANSFORMSTATETYPE */ -#define MAX_CLIPPLANES D3DMAXUSERCLIPPLANES - #define MAX_PALETTES 256 /* Checking of API calls */ diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index baa0c52..d1964eb 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1334,4 +1334,12 @@ #define WINED3DPRESENT_INTERVAL_THREE #define WINED3DPRESENT_INTERVAL_FOUR 0x00000008 #define WINED3DPRESENT_INTERVAL_IMMEDIATE 0x80000000 +#define WINED3DMAXUSERCLIPPLANES 32 +#define WINED3DCLIPPLANE0 (1 << 0) +#define WINED3DCLIPPLANE1 (1 << 1) +#define WINED3DCLIPPLANE2 (1 << 2) +#define WINED3DCLIPPLANE3 (1 << 3) +#define WINED3DCLIPPLANE4 (1 << 4) +#define WINED3DCLIPPLANE5 (1 << 5) + #endif

1 0

Ivan Gyurdiev : wined3d: Add D3DSHADER_ADDRMODE masks to the WINED3D namespace.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: b7edf5b008f953f7802d734c83303b326fb4659b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7edf5b008f953f7802d734c8… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 23:35:03 2006 -0400 wined3d: Add D3DSHADER_ADDRMODE masks to the WINED3D namespace. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/baseshader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- dlls/wined3d/wined3d_private_types.h | 13 ++++++++++++- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fece941..ddfb3b4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -388,7 +388,7 @@ static void vshader_program_add_param(SH strcat(hwLine, tmpReg); break; case WINED3DSPR_CONST: - sprintf(tmpReg, "C[%s%u]", (param & D3DVS_ADDRMODE_RELATIVE) ? "A0.x + " : "", reg); + sprintf(tmpReg, "C[%s%u]", (param & WINED3DSHADER_ADDRMODE_RELATIVE) ? "A0.x + " : "", reg); strcat(hwLine, tmpReg); break; case WINED3DSPR_ADDR: /*case D3DSPR_TEXTURE:*/ diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index d8b9f9f..0bef05b 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -102,7 +102,7 @@ int shader_get_param( IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; char rel_token = D3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 2 && - ((*pToken & D3DSHADER_ADDRESSMODE_MASK) == D3DSHADER_ADDRMODE_RELATIVE); + ((*pToken & WINED3DSHADER_ADDRESSMODE_MASK) == WINED3DSHADER_ADDRMODE_RELATIVE); *param = *pToken; *addr_token = rel_token? *(pToken + 1): 0; @@ -480,7 +480,7 @@ static void shader_dump_arr_entry( int input) { char relative = - ((param & D3DSHADER_ADDRESSMODE_MASK) == D3DSHADER_ADDRMODE_RELATIVE); + ((param & WINED3DSHADER_ADDRESSMODE_MASK) == WINED3DSHADER_ADDRMODE_RELATIVE); if (relative) { TRACE("["); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3637c9f..fde1b4c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -635,7 +635,7 @@ static void shader_glsl_get_register_nam const char* prefix = pshader? "PC":"VC"; /* Relative addressing */ - if (param & D3DVS_ADDRMODE_RELATIVE) { + if (param & WINED3DSHADER_ADDRMODE_RELATIVE) { /* Relative addressing on shaders 2.0+ have a relative address token, * prior to that, it was hard-coded as "A0.x" because there's only 1 register */ diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 9e48107..33e1040 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -926,7 +926,7 @@ #endif p[i] = &input->V[reg]; break; case WINED3DSPR_CONST: - if (pToken[i] & D3DVS_ADDRMODE_RELATIVE) { + if (pToken[i] & WINED3DSHADER_ADDRMODE_RELATIVE) { p[i] = &This->data->C[(DWORD) A[0].x + reg]; } else { p[i] = &This->data->C[reg]; diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index e022922..79666fe 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -156,7 +156,18 @@ typedef enum _WINED3DSHADER_PARAM_DSTMOD #define WINED3DSP_DSTSHIFT_SHIFT 24 #define WINED3DSP_DSTSHIFT_MASK (0xF << WINED3DSP_DSTSHIFT_SHIFT) -/** opcodes types for PS and VS */ +/** Register addressing modes **/ +#define WINED3DSHADER_ADDRESSMODE_SHIFT 13 +#define WINED3DSHADER_ADDRESSMODE_MASK (1 << WINED3DSHADER_ADDRESSMODE_SHIFT) + +typedef enum _WINED3DSHADER_ADDRESSMODE_TYPE { + WINED3DSHADER_ADDRMODE_ABSOLUTE = 0 << WINED3DSHADER_ADDRESSMODE_SHIFT, + WINED3DSHADER_ADDRMODE_RELATIVE = 1 << WINED3DSHADER_ADDRESSMODE_SHIFT, + + WINED3DSHADER_ADDRMODE_FORCE_DWORD = 0x7FFFFFFF +} WINED3DSHADER_ADDRESSMODE_TYPE; + +/** Opcode types */ typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE { WINED3DSIO_NOP = 0, WINED3DSIO_MOV = 1,

1 0

Ivan Gyurdiev : wined3d: Add D3DSI and other opcode masks to the WINED3D namespace.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: 29aa316d6775dfd19727e98e34717df3a8344d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29aa316d6775dfd19727e98e3… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 23:34:13 2006 -0400 wined3d: Add D3DSI and other opcode masks to the WINED3D namespace. --- dlls/wined3d/baseshader.c | 20 ++++++++++---------- dlls/wined3d/vertexshader.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- dlls/wined3d/wined3d_private_types.h | 15 +++++++++++++++ 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index d53f2c8..d8b9f9f 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -74,7 +74,7 @@ const SHADER_OPCODE* shader_get_opcode( /** TODO: use dichotomic search */ while (NULL != shader_ins[i].name) { - if (((code & D3DSI_OPCODE_MASK) == shader_ins[i].opcode) && + if (((code & WINED3DSI_OPCODE_MASK) == shader_ins[i].opcode) && (((hex_version >= shader_ins[i].min_version) && (hex_version <= shader_ins[i].max_version)) || ((shader_ins[i].min_version == 0) && (shader_ins[i].max_version == 0)))) { return &shader_ins[i]; @@ -82,7 +82,7 @@ const SHADER_OPCODE* shader_get_opcode( ++i; } FIXME("Unsupported opcode %#x(%d) masked %#x, shader version %#x\n", - code, code, code & D3DSI_OPCODE_MASK, hex_version); + code, code, code & WINED3DSI_OPCODE_MASK, hex_version); return NULL; } @@ -119,7 +119,7 @@ static inline int shader_skip_opcode( * have a useful legnth mask - use it here. Shaders 1.0 contain no such tokens */ return (D3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 2)? - ((opcode_token & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT): + ((opcode_token & WINED3DSI_INSTLENGTH_MASK) >> WINED3DSI_INSTLENGTH_SHIFT): curOpcode->num_params; } @@ -202,7 +202,7 @@ HRESULT shader_get_registers_used( /* Skip comments */ } else if (shader_is_comment(*pToken)) { - DWORD comment_len = (*pToken & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; ++pToken; pToken += comment_len; continue; @@ -354,7 +354,7 @@ HRESULT shader_get_registers_used( * okay, since we'll catch any address registers when * they are initialized (required by spec) */ - limit = (opcode_token & D3DSHADER_INSTRUCTION_PREDICATED)? + limit = (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED)? curOpcode->num_params + 1: curOpcode->num_params; for (i = 0; i < limit; ++i) { @@ -699,7 +699,7 @@ void shader_generate_main( /* Skip comment tokens */ if (shader_is_comment(*pToken)) { - DWORD comment_len = (*pToken & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; ++pToken; TRACE("#%s\n", (char*)pToken); pToken += comment_len; @@ -749,7 +749,7 @@ void shader_generate_main( } /* Predication token */ - if (hw_arg.opcode_token & D3DSHADER_INSTRUCTION_PREDICATED) + if (hw_arg.opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) hw_arg.predicate = *pToken++; /* Other source tokens */ @@ -832,7 +832,7 @@ void shader_trace_init( continue; } if (shader_is_comment(*pToken)) { /** comment */ - DWORD comment_len = (*pToken & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; ++pToken; TRACE("//%s\n", (char*)pToken); pToken += comment_len; @@ -901,7 +901,7 @@ void shader_trace_init( /* Print out predication source token first - it follows * the destination token. */ - if (opcode_token & D3DSHADER_INSTRUCTION_PREDICATED) { + if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) { TRACE("("); shader_dump_param(iface, *(pToken + 2), 0, 1); TRACE(") "); @@ -939,7 +939,7 @@ void shader_trace_init( } /* Predication token - already printed out, just skip it */ - if (opcode_token & D3DSHADER_INSTRUCTION_PREDICATED) { + if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) { pToken++; len++; } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 07429b6..9e48107 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -895,7 +895,7 @@ #endif } while (D3DVS_END() != *pToken) { if (shader_is_comment(*pToken)) { /** comment */ - DWORD comment_len = (*pToken & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; ++pToken; pToken += comment_len; continue ; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c3512f2..60a934a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1683,7 +1683,7 @@ inline static BOOL shader_is_vshader_ver } inline static BOOL shader_is_comment(DWORD token) { - return WINED3DSIO_COMMENT == (token & D3DSI_OPCODE_MASK); + return WINED3DSIO_COMMENT == (token & WINED3DSI_OPCODE_MASK); } /* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index c075c70..e022922 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -249,4 +249,19 @@ typedef enum _WINED3DSHADER_INSTRUCTION_ WINED3DSIO_FORCE_DWORD = 0X7FFFFFFF /** for 32-bit alignment */ } WINED3DSHADER_INSTRUCTION_OPCODE_TYPE; +/** opcode-related masks **/ + +#define WINED3DSI_OPCODE_MASK 0x0000FFFF +#define WINED3DSI_INSTLENGTH_MASK 0x0F000000 +#define WINED3DSI_INSTLENGTH_SHIFT 24 + +#define WINED3DSI_COISSUE 0x40000000 + +#define WINED3DSI_COMMENTSIZE_SHIFT 16 +#define WINED3DSI_COMMENTSIZE_MASK (0x7FFF << WINED3DSI_COMMENTSIZE_SHIFT) +#define WINED3DSHADER_COMMENT(commentSize) \ + ((((commentSize) << WINED3DSI_COMMENTSIZE_SHIFT) & WINED3DSI_COMMENTSIZE_MASK) | WINED3DSIO_COMMENT) + +#define WINED3DSHADER_INSTRUCTION_PREDICATED (1 << 28) + #endif

1 0

Ivan Gyurdiev : wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: c912032aa59ad69d486d4676bb365ee2b83f8844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c912032aa59ad69d486d4676b… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 23:33:03 2006 -0400 wined3d: Add D3DTEXTUREOP to the WINED3D namespace. --- dlls/ddraw/device.c | 16 +- dlls/wined3d/drawprim.c | 6 - dlls/wined3d/stateblock.c | 4 - dlls/wined3d/utils.c | 270 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 4 - include/wine/wined3d_types.h | 31 +++++ 6 files changed, 181 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c912032aa59ad69d486d4…

1 0

Ivan Gyurdiev : wined3d: Add D3DVERTEXBLENDFLAGS to the WINED3D namespace.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: 6f0bb0f6fc92e4831f20bed241e6f3fd693063ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f0bb0f6fc92e4831f20bed24… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 23:33:44 2006 -0400 wined3d: Add D3DVERTEXBLENDFLAGS to the WINED3D namespace. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d_types.h | 8 ++++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 83e9a83..ee966b0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4029,7 +4029,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_VERTEXBLEND : { - This->updateStateBlock->vertex_blend = (D3DVERTEXBLENDFLAGS) Value; + This->updateStateBlock->vertex_blend = (WINED3DVERTEXBLENDFLAGS) Value; TRACE("Vertex Blending state to %d\n", Value); } break; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 18a2ea7..8cc99ed 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -908,7 +908,7 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_SPECULARMATERIALSOURCE, D3DMCS_COLOR2); IWineD3DDevice_SetRenderState(device, WINED3DRS_AMBIENTMATERIALSOURCE, D3DMCS_MATERIAL); IWineD3DDevice_SetRenderState(device, WINED3DRS_EMISSIVEMATERIALSOURCE, D3DMCS_MATERIAL); - IWineD3DDevice_SetRenderState(device, WINED3DRS_VERTEXBLEND, D3DVBF_DISABLE); + IWineD3DDevice_SetRenderState(device, WINED3DRS_VERTEXBLEND, WINED3DVBF_DISABLE); IWineD3DDevice_SetRenderState(device, WINED3DRS_CLIPPLANEENABLE, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_SOFTWAREVERTEXPROCESSING, FALSE); tmpfloat.f = 1.0f; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dfdc21a..c3512f2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1135,7 +1135,7 @@ struct IWineD3DStateBlockImpl float *pixelShaderConstantF; /* Indexed Vertex Blending */ - D3DVERTEXBLENDFLAGS vertex_blend; + WINED3DVERTEXBLENDFLAGS vertex_blend; FLOAT tween_factor; /* RenderState */ diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index c8cf672..baa0c52 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -442,6 +442,14 @@ typedef enum _WINED3DRENDERSTATETYPE { #define WINEHIGHEST_RENDER_STATE WINED3DRS_BLENDOPALPHA /* Highest WINED3DRS_ value */ +typedef enum _WINED3DVERTEXBLENDFLAGS { + WINED3DVBF_DISABLE = 0, + WINED3DVBF_1WEIGHTS = 1, + WINED3DVBF_2WEIGHTS = 2, + WINED3DVBF_3WEIGHTS = 3, + WINED3DVBF_TWEENING = 255, + WINED3DVBF_0WEIGHTS = 256 +} WINED3DVERTEXBLENDFLAGS; typedef struct _WINED3DDISPLAYMODE { UINT Width;

1 0

Stefan Dösinger : ddraw: Do not let the a surface dimension fall to 0.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: 75c67f6b459fa5f26844d50436413967f59dbd60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c67f6b459fa5f26844d5043… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Oct 12 19:37:21 2006 +0200 ddraw: Do not let the a surface dimension fall to 0. --- dlls/ddraw/ddraw.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index aa21eb0..fc80517 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2331,8 +2331,8 @@ IDirectDrawImpl_CreateSurface(IDirectDra if(DDSD->ddsCaps.dwCaps & DDSCAPS_MIPMAP) { level++; - desc2.dwWidth /= 2; - desc2.dwHeight /= 2; + if(desc2.dwWidth > 1) desc2.dwWidth /= 2; + if(desc2.dwHeight > 1) desc2.dwHeight /= 2; } hr = IDirectDrawImpl_CreateNewSurface(This,

1 0

Stefan Dösinger : ddraw: Remove an incorrect size check.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: b4afa19272abefb22c43af5852496b02ced510aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4afa19272abefb22c43af585… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Oct 12 19:31:01 2006 +0200 ddraw: Remove an incorrect size check. --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a9177a5..aa21eb0 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2315,7 +2315,7 @@ IDirectDrawImpl_CreateSurface(IDirectDra desc2.ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; } /* Set the DDSCAPS2_MIPMAPSUBLEVEL flag on mipmap sublevels according to the msdn */ - if((DDSD->ddsCaps.dwCaps & DDSCAPS_MIPMAP)&&(DDSD->dwSize >= sizeof(DDSURFACEDESC2))) + if(DDSD->ddsCaps.dwCaps & DDSCAPS_MIPMAP) { desc2.ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL; }

1 0

Detlef Riekenberg : shell32: Fix typo in Run dialog.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: 1f2219d52195153bc0d23f5fcbb748c462c17ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2219d52195153bc0d23f5fc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Oct 12 22:27:44 2006 +0200 shell32: Fix typo in Run dialog. --- dlls/shell32/shell32_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index b1017fc..803d584 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -124,7 +124,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Geben sie den Namen eines Programmes, eines Ordners, eines Dokumentes oder einer Internet-Ressource ein, dei ge�ffnet werden soll", 12289, 36, 11, 182, 18 + LTEXT "Geben sie den Namen eines Programmes, eines Ordners, eines Dokumentes oder einer Internet-Ressource ein, die ge�ffnet werden soll", 12289, 36, 11, 182, 18 LTEXT "�&ffnen:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP

1 0

Michael Stefaniuc : gdi: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: a0b260e7d73a5ab87f51ff8a3f71d7ce1212bb7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b260e7d73a5ab87f51ff8a3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 12 22:56:56 2006 +0200 gdi: Win64 printf format warning fixes. --- dlls/gdi/Makefile.in | 2 +- dlls/gdi/bidi.c | 2 +- dlls/gdi/bitblt.c | 6 ++--- dlls/gdi/bitmap.c | 8 +++--- dlls/gdi/brush.c | 8 +++--- dlls/gdi/clipping.c | 6 ++--- dlls/gdi/dc.c | 16 ++++++------ dlls/gdi/dib.c | 12 +++++---- dlls/gdi/driver.c | 2 +- dlls/gdi/enhmetafile.c | 32 ++++++++++++------------- dlls/gdi/enhmfdrv/graphics.c | 2 +- dlls/gdi/enhmfdrv/init.c | 2 +- dlls/gdi/font.c | 50 +++++++++++++++++++-------------------- dlls/gdi/freetype.c | 54 +++++++++++++++++++++--------------------- dlls/gdi/gdi16.c | 4 ++- dlls/gdi/gdiobj.c | 16 ++++++------ dlls/gdi/metafile.c | 10 ++++---- dlls/gdi/mfdrv/bitblt.c | 2 +- dlls/gdi/mfdrv/init.c | 2 +- dlls/gdi/opengl.c | 4 ++- dlls/gdi/painting.c | 2 +- dlls/gdi/palette.c | 16 ++++++------ dlls/gdi/path.c | 8 +++--- dlls/gdi/pen.c | 2 +- dlls/gdi/printdrv.c | 4 ++- dlls/gdi/region.c | 12 +++++---- dlls/gdi/wing.c | 4 ++- 27 files changed, 144 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0b260e7d73a5ab87f51f…

1 0