May 2013 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Add support for GLSL based fixed function vertex shaders.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 2014141a253a791fc9c79aae3c8ef3c35b73e658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2014141a253a791fc9c79aae3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 29 09:45:35 2013 +0200 wined3d: Add support for GLSL based fixed function vertex shaders. --- dlls/wined3d/directx.c | 10 +- dlls/wined3d/glsl_shader.c | 541 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 41 ++-- dlls/wined3d/utils.c | 96 +++++++ dlls/wined3d/wined3d_private.h | 83 ++++++ 5 files changed, 738 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2014141a253a791fc9c79…

1 0

Henri Verbeet : wined3d: Only write gl_PointSize for point primitives in shader_glsl_generate_ffp_vertex_shader ().
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 1c2392ddb07403389cfa65a1b78a493a20c0c885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2392ddb07403389cfa65a1b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 29 09:45:36 2013 +0200 wined3d: Only write gl_PointSize for point primitives in shader_glsl_generate_ffp_vertex_shader(). --- dlls/wined3d/device.c | 9 ++++++++- dlls/wined3d/glsl_shader.c | 12 ++++++++---- dlls/wined3d/state.c | 4 +++- dlls/wined3d/stateblock.c | 10 ++++++++-- dlls/wined3d/utils.c | 4 ++++ dlls/wined3d/wined3d_private.h | 8 ++++++-- 6 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 47da78b..249a15d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3981,10 +3981,17 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_type) { + GLenum gl_primitive_type, prev; + TRACE("device %p, primitive_type %s\n", device, debug_d3dprimitivetype(primitive_type)); device->updateStateBlock->changed.primitive_type = TRUE; - device->updateStateBlock->state.gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); + gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); + prev = device->updateStateBlock->state.gl_primitive_type; + device->updateStateBlock->state.gl_primitive_type = gl_primitive_type; + if (!device->isRecordingState && gl_primitive_type != prev + && (gl_primitive_type == GL_POINTS || prev == GL_POINTS)) + device_invalidate_state(device, STATE_POINT_SIZE_ENABLE); } void CDECL wined3d_device_get_primitive_type(const struct wined3d_device *device, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 60a904a..9e3afe7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5007,10 +5007,13 @@ static GLhandleARB shader_glsl_generate_ffp_vertex_shader(struct wined3d_shader_ break; } - shader_addline(buffer, "gl_PointSize = gl_Point.size / sqrt(gl_Point.distanceConstantAttenuation" - " + gl_Point.distanceLinearAttenuation * length(ec_pos.xyz)" - " + gl_Point.distanceQuadraticAttenuation * dot(ec_pos.xyz, ec_pos.xyz));\n"); - shader_addline(buffer, "gl_PointSize = clamp(gl_PointSize, gl_Point.sizeMin, gl_Point.sizeMax);\n"); + if (settings->point_size) + { + shader_addline(buffer, "gl_PointSize = gl_Point.size / sqrt(gl_Point.distanceConstantAttenuation" + " + gl_Point.distanceLinearAttenuation * length(ec_pos.xyz)" + " + gl_Point.distanceQuadraticAttenuation * dot(ec_pos.xyz, ec_pos.xyz));\n"); + shader_addline(buffer, "gl_PointSize = clamp(gl_PointSize, gl_Point.sizeMin, gl_Point.sizeMax);\n"); + } shader_addline(buffer, "}\n"); @@ -6871,6 +6874,7 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = {STATE_SAMPLER(7), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(7), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, {STATE_SAMPLER(7), {STATE_SAMPLER(7), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, + {STATE_POINT_SIZE_ENABLE, {STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, {0, NULL }, WINED3D_GL_EXT_NONE }, }; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index eddff66..666983a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5526,6 +5526,7 @@ const struct StateEntryTemplate vp_ffp_states[] = { STATE_SAMPLER(7), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, { STATE_SAMPLER(7), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, + { STATE_POINT_SIZE_ENABLE, { STATE_POINT_SIZE_ENABLE, state_nop }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; @@ -5869,7 +5870,8 @@ static void validate_state_table(struct StateEntry *state_table) STATE_FRONTFACE, STATE_POINTSPRITECOORDORIGIN, STATE_BASEVERTEXINDEX, - STATE_FRAMEBUFFER + STATE_FRAMEBUFFER, + STATE_POINT_SIZE_ENABLE, }; unsigned int i, current; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6d26f71..7a4b2ea 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1073,8 +1073,14 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) if (stateblock->changed.primitive_type) { - stateblock->device->updateStateBlock->changed.primitive_type = TRUE; - stateblock->device->updateStateBlock->state.gl_primitive_type = stateblock->state.gl_primitive_type; + GLenum gl_primitive_type, prev; + + device->updateStateBlock->changed.primitive_type = TRUE; + gl_primitive_type = stateblock->state.gl_primitive_type; + prev = device->updateStateBlock->state.gl_primitive_type; + device->updateStateBlock->state.gl_primitive_type = gl_primitive_type; + if (gl_primitive_type != prev && (gl_primitive_type == GL_POINTS || prev == GL_POINTS)) + device_invalidate_state(device, STATE_POINT_SIZE_ENABLE); } if (stateblock->changed.indices) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 59b91ec..16e8b2d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2588,6 +2588,8 @@ const char *debug_d3dstate(DWORD state) return "STATE_BASEVERTEXINDEX"; if (STATE_IS_FRAMEBUFFER(state)) return "STATE_FRAMEBUFFER"; + if (STATE_IS_POINT_SIZE_ENABLE(state)) + return "STATE_POINT_SIZE_ENABLE"; return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); } @@ -3530,6 +3532,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct { memset(settings, 0, sizeof(*settings)); + settings->point_size = state->gl_primitive_type == GL_POINTS; if (!state->render_states[WINED3D_RS_FOGENABLE]) settings->fog_mode = WINED3D_FFP_VS_FOG_OFF; else if (state->render_states[WINED3D_RS_FOGTABLEMODE] != WINED3D_FOG_NONE) @@ -3552,6 +3555,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct settings->normalize = settings->normal && state->render_states[WINED3D_RS_NORMALIZENORMALS]; settings->lighting = !!state->render_states[WINED3D_RS_LIGHTING]; settings->localviewer = !!state->render_states[WINED3D_RS_LOCALVIEWER]; + settings->point_size = state->gl_primitive_type == GL_POINTS; if (state->render_states[WINED3D_RS_COLORVERTEX] && (si->use_map & (1 << WINED3D_FFP_DIFFUSE))) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5cbd63a..e3b55ca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1007,7 +1007,10 @@ extern glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT] DECLSPEC #define STATE_FRAMEBUFFER (STATE_BASEVERTEXINDEX + 1) #define STATE_IS_FRAMEBUFFER(a) ((a) == STATE_FRAMEBUFFER) -#define STATE_HIGHEST (STATE_FRAMEBUFFER) +#define STATE_POINT_SIZE_ENABLE (STATE_FRAMEBUFFER + 1) +#define STATE_IS_POINT_SIZE_ENABLE(a) ((a) == STATE_POINT_SIZE_ENABLE) + +#define STATE_HIGHEST (STATE_POINT_SIZE_ENABLE) enum fogsource { FOGSOURCE_FFP, @@ -1717,9 +1720,10 @@ struct wined3d_ffp_vs_settings DWORD normalize : 1; DWORD lighting : 1; DWORD localviewer : 1; + DWORD point_size : 1; DWORD fog_mode : 2; DWORD texcoords : 8; /* MAX_TEXTURES */ - DWORD padding : 18; + DWORD padding : 17; BYTE texgen[MAX_TEXTURES]; };

1 0

Henri Verbeet : wined3d: Only write gl_ClipVertex if clipping is enabled in shader_glsl_generate_ffp_vertex_shader ().
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: bdd97858bff48e1b22bd56545bbe4cb4923f646a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd97858bff48e1b22bd56545… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 29 09:45:37 2013 +0200 wined3d: Only write gl_ClipVertex if clipping is enabled in shader_glsl_generate_ffp_vertex_shader(). --- dlls/wined3d/glsl_shader.c | 3 +- dlls/wined3d/state.c | 44 ++++++++++++++++++--------------------- dlls/wined3d/utils.c | 4 +++ dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9e3afe7..b46df8a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4937,7 +4937,8 @@ static GLhandleARB shader_glsl_generate_ffp_vertex_shader(struct wined3d_shader_ shader_addline(buffer, "vec4 ec_pos = gl_ModelViewMatrix * gl_Vertex;\n"); shader_addline(buffer, "gl_Position = gl_ProjectionMatrix * ec_pos;\n"); - shader_addline(buffer, "gl_ClipVertex = ec_pos;\n"); + if (settings->clipping) + shader_addline(buffer, "gl_ClipVertex = ec_pos;\n"); shader_addline(buffer, "ec_pos /= ec_pos.w;\n"); if (!settings->normal) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 666983a..c01f516 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -593,32 +593,28 @@ void state_clipping(struct wined3d_context *context, const struct wined3d_state DWORD enable = 0xffffffff; DWORD disable = 0x00000000; - if (use_vs(state)) + if (use_vs(state) && !context->d3d_info->vs_clipping) { - if (!context->d3d_info->vs_clipping) - { - /* The spec says that opengl clipping planes are disabled when using shaders. Direct3D planes aren't, - * so that is an issue. The MacOS ATI driver keeps clipping planes activated with shaders in some - * conditions I got sick of tracking down. The shader state handler disables all clip planes because - * of that - don't do anything here and keep them disabled - */ - if (state->render_states[WINED3D_RS_CLIPPLANEENABLE]) - { - static BOOL warned = FALSE; - if(!warned) { - FIXME("Clipping not supported with vertex shaders\n"); - warned = TRUE; - } - } - return; - } + static BOOL warned; - /* glEnable(GL_CLIP_PLANEx) doesn't apply to vertex shaders. The enabled / disabled planes are - * hardcoded into the shader. Update the shader to update the enabled clipplanes */ - context->select_shader = 1; - context->load_constants = 1; + /* The OpenGL spec says that clipping planes are disabled when using + * shaders. Direct3D planes aren't, so that is an issue. The MacOS ATI + * driver keeps clipping planes activated with shaders in some + * conditions I got sick of tracking down. The shader state handler + * disables all clip planes because of that - don't do anything here + * and keep them disabled. */ + if (state->render_states[WINED3D_RS_CLIPPLANEENABLE] && !warned++) + FIXME("Clipping not supported with vertex shaders\n"); + return; } + /* glEnable(GL_CLIP_PLANEx) doesn't apply to (ARB backend) vertex shaders. + * The enabled / disabled planes are hardcoded into the shader. Update the + * shader to update the enabled clipplanes. In case of fixed function, we + * need to update the clipping field from ffp_vertex_settings. */ + context->select_shader = 1; + context->load_constants = 1; + /* TODO: Keep track of previously enabled clipplanes to avoid unnecessary resetting * of already set values */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 16e8b2d..4f3ab2f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3532,6 +3532,8 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct { memset(settings, 0, sizeof(*settings)); + settings->clipping = state->render_states[WINED3D_RS_CLIPPING] + && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; settings->point_size = state->gl_primitive_type == GL_POINTS; if (!state->render_states[WINED3D_RS_FOGENABLE]) settings->fog_mode = WINED3D_FFP_VS_FOG_OFF; @@ -3551,6 +3553,8 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct return; } + settings->clipping = state->render_states[WINED3D_RS_CLIPPING] + && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; settings->normal = !!(si->use_map & (1 << WINED3D_FFP_NORMAL)); settings->normalize = settings->normal && state->render_states[WINED3D_RS_NORMALIZENORMALS]; settings->lighting = !!state->render_states[WINED3D_RS_LIGHTING]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e3b55ca..55cfa94 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1716,6 +1716,7 @@ struct wined3d_ffp_vs_settings DWORD ambient_source : 2; DWORD specular_source : 2; + DWORD clipping : 1; DWORD normal : 1; DWORD normalize : 1; DWORD lighting : 1; @@ -1723,7 +1724,7 @@ struct wined3d_ffp_vs_settings DWORD point_size : 1; DWORD fog_mode : 2; DWORD texcoords : 8; /* MAX_TEXTURES */ - DWORD padding : 17; + DWORD padding : 16; BYTE texgen[MAX_TEXTURES]; };

1 0

Henri Verbeet : wined3d: Only invalidate the current ffp vertex shader if the light type changed.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 74c5a22daa1e344fa4b60c71e875605191c65c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c5a22daa1e344fa4b60c71e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 29 09:45:38 2013 +0200 wined3d: Only invalidate the current ffp vertex shader if the light type changed. As opposed to any time a light parameter changed. --- dlls/wined3d/device.c | 18 ++++++++++++++---- dlls/wined3d/glsl_shader.c | 24 +++++++++--------------- dlls/wined3d/state.c | 2 ++ dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_private.h | 4 +++- 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 249a15d..ac6a334 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1783,6 +1783,14 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, TRACE("... Range(%f), Falloff(%f), Theta(%f), Phi(%f)\n", light->range, light->falloff, light->theta, light->phi); + /* Update the live definitions if the light is currently assigned a glIndex. */ + if (object->glIndex != -1 && !device->isRecordingState) + { + if (object->OriginalParms.type != light->type) + device_invalidate_state(device, STATE_LIGHT_TYPE); + device_invalidate_state(device, STATE_ACTIVELIGHT(object->glIndex)); + } + /* Save away the information. */ object->OriginalParms = *light; @@ -1855,10 +1863,6 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, FIXME("Unrecognized light type %#x.\n", light->type); } - /* Update the live definitions if the light is currently assigned a glIndex. */ - if (object->glIndex != -1 && !device->isRecordingState) - device_invalidate_state(device, STATE_ACTIVELIGHT(object->glIndex)); - return WINED3D_OK; } @@ -1932,7 +1936,10 @@ HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UIN if (light_info->glIndex != -1) { if (!device->isRecordingState) + { + device_invalidate_state(device, STATE_LIGHT_TYPE); device_invalidate_state(device, STATE_ACTIVELIGHT(light_info->glIndex)); + } device->updateStateBlock->state.lights[light_info->glIndex] = NULL; light_info->glIndex = -1; @@ -1978,7 +1985,10 @@ HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UIN /* i == light_info->glIndex */ if (!device->isRecordingState) + { + device_invalidate_state(device, STATE_LIGHT_TYPE); device_invalidate_state(device, STATE_ACTIVELIGHT(i)); + } } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b46df8a..e85b57e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6729,13 +6729,6 @@ static void glsl_vertex_pipe_shader(struct wined3d_context *context, context->select_shader = 1; } -static void glsl_vertex_pipe_light(struct wined3d_context *context, - const struct wined3d_state *state, DWORD state_id) -{ - light(context, state, state_id); - context->select_shader = 1; -} - static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = { {STATE_VDECL, {STATE_VDECL, vertexdeclaration }, WINED3D_GL_EXT_NONE }, @@ -6776,14 +6769,15 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = {STATE_CLIPPLANE(30), {STATE_CLIPPLANE(30), clipplane }, WINED3D_GL_EXT_NONE }, {STATE_CLIPPLANE(31), {STATE_CLIPPLANE(31), clipplane }, WINED3D_GL_EXT_NONE }, /* Lights */ - {STATE_ACTIVELIGHT(0), {STATE_ACTIVELIGHT(0), glsl_vertex_pipe_light }, WINED3D_GL_EXT_NONE }, - {STATE_ACTIVELIGHT(1), {STATE_ACTIVELIGHT(1), glsl_vertex_pipe_light }, WINED3D_GL_EXT_NONE }, - {STATE_ACTIVELIGHT(2), {STATE_ACTIVELIGHT(2), glsl_vertex_pipe_light }, WINED3D_GL_EXT_NONE }, - {STATE_ACTIVELIGHT(3), {STATE_ACTIVELIGHT(3), glsl_vertex_pipe_light }, WINED3D_GL_EXT_NONE }, - {STATE_ACTIVELIGHT(4), {STATE_ACTIVELIGHT(4), glsl_vertex_pipe_light }, WINED3D_GL_EXT_NONE }, - {STATE_ACTIVELIGHT(5), {STATE_ACTIVELIGHT(5), glsl_vertex_pipe_light }, WINED3D_GL_EXT_NONE }, - {STATE_ACTIVELIGHT(6), {STATE_ACTIVELIGHT(6), glsl_vertex_pipe_light }, WINED3D_GL_EXT_NONE }, - {STATE_ACTIVELIGHT(7), {STATE_ACTIVELIGHT(7), glsl_vertex_pipe_light }, WINED3D_GL_EXT_NONE }, + {STATE_LIGHT_TYPE, {STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_ACTIVELIGHT(0), {STATE_ACTIVELIGHT(0), light }, WINED3D_GL_EXT_NONE }, + {STATE_ACTIVELIGHT(1), {STATE_ACTIVELIGHT(1), light }, WINED3D_GL_EXT_NONE }, + {STATE_ACTIVELIGHT(2), {STATE_ACTIVELIGHT(2), light }, WINED3D_GL_EXT_NONE }, + {STATE_ACTIVELIGHT(3), {STATE_ACTIVELIGHT(3), light }, WINED3D_GL_EXT_NONE }, + {STATE_ACTIVELIGHT(4), {STATE_ACTIVELIGHT(4), light }, WINED3D_GL_EXT_NONE }, + {STATE_ACTIVELIGHT(5), {STATE_ACTIVELIGHT(5), light }, WINED3D_GL_EXT_NONE }, + {STATE_ACTIVELIGHT(6), {STATE_ACTIVELIGHT(6), light }, WINED3D_GL_EXT_NONE }, + {STATE_ACTIVELIGHT(7), {STATE_ACTIVELIGHT(7), light }, WINED3D_GL_EXT_NONE }, /* Viewport */ {STATE_VIEWPORT, {STATE_VIEWPORT, viewport_vertexpart }, WINED3D_GL_EXT_NONE }, /* Transform states */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c01f516..1204744 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5167,6 +5167,7 @@ const struct StateEntryTemplate vp_ffp_states[] = { STATE_CLIPPLANE(30), { STATE_CLIPPLANE(30), clipplane }, WINED3D_GL_EXT_NONE }, { STATE_CLIPPLANE(31), { STATE_CLIPPLANE(31), clipplane }, WINED3D_GL_EXT_NONE }, /* Lights */ + { STATE_LIGHT_TYPE, { STATE_LIGHT_TYPE, state_nop }, WINED3D_GL_EXT_NONE }, { STATE_ACTIVELIGHT(0), { STATE_ACTIVELIGHT(0), light }, WINED3D_GL_EXT_NONE }, { STATE_ACTIVELIGHT(1), { STATE_ACTIVELIGHT(1), light }, WINED3D_GL_EXT_NONE }, { STATE_ACTIVELIGHT(2), { STATE_ACTIVELIGHT(2), light }, WINED3D_GL_EXT_NONE }, @@ -5862,6 +5863,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_GEOMETRY_SHADER, STATE_PIXELSHADER, STATE_VIEWPORT, + STATE_LIGHT_TYPE, STATE_SCISSORRECT, STATE_FRONTFACE, STATE_POINTSPRITECOORDORIGIN, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4f3ab2f..0442957 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2572,6 +2572,8 @@ const char *debug_d3dstate(DWORD state) return "STATE_VERTEXSHADERCONSTANT"; if (STATE_IS_PIXELSHADERCONSTANT(state)) return "STATE_PIXELSHADERCONSTANT"; + if (STATE_IS_LIGHT_TYPE(state)) + return "STATE_LIGHT_TYPE"; if (STATE_IS_ACTIVELIGHT(state)) return wine_dbg_sprintf("STATE_ACTIVELIGHT(%#x)", state - STATE_ACTIVELIGHT(0)); if (STATE_IS_SCISSORRECT(state)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 55cfa94..9e63f2c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -983,7 +983,9 @@ extern glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT] DECLSPEC #define STATE_IS_VERTEXSHADERCONSTANT(a) ((a) == STATE_VERTEXSHADERCONSTANT) #define STATE_IS_PIXELSHADERCONSTANT(a) ((a) == STATE_PIXELSHADERCONSTANT) -#define STATE_ACTIVELIGHT(a) (STATE_PIXELSHADERCONSTANT + (a) + 1) +#define STATE_LIGHT_TYPE (STATE_PIXELSHADERCONSTANT + 1) +#define STATE_IS_LIGHT_TYPE(a) ((a) == STATE_LIGHT_TYPE) +#define STATE_ACTIVELIGHT(a) (STATE_LIGHT_TYPE + 1 + (a)) #define STATE_IS_ACTIVELIGHT(a) ((a) >= STATE_ACTIVELIGHT(0) && (a) < STATE_ACTIVELIGHT(MAX_ACTIVE_LIGHTS)) #define STATE_SCISSORRECT (STATE_ACTIVELIGHT(MAX_ACTIVE_LIGHTS - 1) + 1)

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMATERIAL2.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 735e69f94e8fe8b7f357b1b4b5e12b0437f69ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=735e69f94e8fe8b7f357b1b4b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 29 09:45:39 2013 +0200 d3drm: Avoid LPDIRECT3DRMMATERIAL2. --- dlls/d3drm/d3drm.c | 15 ++++++--------- dlls/d3drm/frame.c | 14 ++++---------- dlls/d3drm/meshbuilder.c | 14 +++++++------- dlls/d3drm/tests/d3drm.c | 38 +++++++++++++++++++------------------- include/d3drm.h | 2 +- include/d3drmobj.h | 10 +++++----- 6 files changed, 42 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=735e69f94e8fe8b7f357b…

1 0

Alexandre Julliard : comctl32: Remove comments about native behavior, that' s not a valid source of information.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 7624da76a80a689935d84e1c1837cfd924c51697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7624da76a80a689935d84e1c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 15:43:27 2013 +0200 comctl32: Remove comments about native behavior, that's not a valid source of information. --- dlls/comctl32/comboex.c | 146 ---------------------------------------------- dlls/comctl32/listview.c | 18 ------ dlls/comctl32/rebar.c | 40 ------------- dlls/comctl32/toolbar.c | 45 +-------------- 4 files changed, 1 insertions(+), 248 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7624da76a80a689935d84…

1 0

Alexandre Julliard : comctl32/comboex: Add support for setting the font.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 3e33f61c562a53c62d2e66ab5abfb9c26f6237c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e33f61c562a53c62d2e66ab5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 15:55:32 2013 +0200 comctl32/comboex: Add support for setting the font. --- dlls/comctl32/comboex.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 244cc95..f1acc7d 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1607,6 +1607,15 @@ static LRESULT COMBOEX_Size (COMBOEX_INFO *infoPtr, INT width, INT height) return 0; } +static LRESULT COMBOEX_SetFont( COMBOEX_INFO *infoPtr, HFONT font, BOOL redraw ) +{ + infoPtr->font = font; + SendMessageW( infoPtr->hwndCombo, WM_SETFONT, (WPARAM)font, 0 ); + if (infoPtr->hwndEdit) SendMessageW( infoPtr->hwndEdit, WM_SETFONT, (WPARAM)font, 0 ); + COMBOEX_ReSize( infoPtr ); + if (redraw) InvalidateRect( infoPtr->hwndCombo, NULL, TRUE ); + return 0; +} static LRESULT COMBOEX_SetRedraw(const COMBOEX_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { @@ -2136,6 +2145,12 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_SIZE: return COMBOEX_Size (infoPtr, LOWORD(lParam), HIWORD(lParam)); + case WM_GETFONT: + return (LRESULT)infoPtr->font; + + case WM_SETFONT: + return COMBOEX_SetFont( infoPtr, (HFONT)wParam, LOWORD(lParam) != 0 ); + case WM_SETREDRAW: return COMBOEX_SetRedraw(infoPtr, wParam, lParam);

1 0

Alexandre Julliard : comdlg32: Scale the listboxes in the font dialog with the font size.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 60b5ae785a850ee94cdff6254ec6be5abfc28936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b5ae785a850ee94cdff6254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 16:28:48 2013 +0200 comdlg32: Scale the listboxes in the font dialog with the font size. --- dlls/comdlg32/fontdlg.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 25dc1e4..e5b87bf 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -782,7 +782,7 @@ static LRESULT CFn_WMMeasureItem(HWND hDlg, LPARAM lParam) /* use MAX of bitmap height and tm.tmHeight .*/ hdc=GetDC(hDlg); if(!hdc) return 0; - hfontprev = SelectObject( hdc, GetStockObject( DEFAULT_GUI_FONT ) ); + hfontprev = SelectObject( hdc, (HFONT)SendMessageW( hDlg, WM_GETFONT, 0, 0 )); GetTextMetricsW(hdc, &tm); if( tm.tmHeight > lpmi->itemHeight) lpmi->itemHeight = tm.tmHeight; SelectObject(hdc, hfontprev); @@ -801,7 +801,7 @@ static LRESULT CFn_WMDrawItem(LPARAM lParam) COLORREF cr, oldText=0, oldBk=0; RECT rect; int nFontType; - int idx; + int cx, cy, idx; LPDRAWITEMSTRUCT lpdi = (LPDRAWITEMSTRUCT)lParam; if (lpdi->itemID == (UINT)-1) /* got no items */ @@ -830,9 +830,10 @@ static LRESULT CFn_WMDrawItem(LPARAM lParam) { case cmb1: /* TRACE(commdlg,"WM_Drawitem cmb1\n"); */ + ImageList_GetIconSize( himlTT, &cx, &cy); SendMessageW(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID, (LPARAM)buffer); - TextOutW(lpdi->hDC, lpdi->rcItem.left + TTBITMAP_XSIZE + 10, + TextOutW(lpdi->hDC, lpdi->rcItem.left + cx + 4, lpdi->rcItem.top, buffer, lstrlenW(buffer)); nFontType = SendMessageW(lpdi->hwndItem, CB_GETITEMDATA, lpdi->itemID,0L); idx = -1; @@ -848,7 +849,7 @@ static LRESULT CFn_WMDrawItem(LPARAM lParam) idx = 1; /* picture: printer */ if( idx >= 0) ImageList_Draw( himlTT, idx, lpdi->hDC, lpdi->rcItem.left, - lpdi->rcItem.top, ILD_TRANSPARENT); + (lpdi->rcItem.top + lpdi->rcItem.bottom - cy) / 2, ILD_TRANSPARENT); break; case cmb2: case cmb3:

1 0

Alexandre Julliard : comdlg32: Scale the shell folder list in the open dialog with the font size.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 6a40d65ba83bb5f7f230538e051813e0d0baffeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a40d65ba83bb5f7f230538e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 16:17:48 2013 +0200 comdlg32: Scale the shell folder list in the open dialog with the font size. --- dlls/comdlg32/filedlg.c | 56 ++++++++++++++++++++------------------- dlls/comdlg32/filedlgbrowser.c | 1 + 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 9481517..c08e8d4 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -110,7 +110,6 @@ typedef struct tagLookInInfo */ /* Draw item constant */ -#define ICONWIDTH 18 #define XTEXTOFFSET 3 /* AddItem flags*/ @@ -3182,7 +3181,8 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) IShellFolder *psfRoot, *psfDrives; IEnumIDList *lpeRoot, *lpeDrives; LPITEMIDLIST pidlDrives, pidlTmp, pidlTmp1, pidlAbsTmp; - + HDC hdc; + TEXTMETRICW tm; LookInInfos *liInfos = MemAlloc(sizeof(LookInInfos)); TRACE("\n"); @@ -3191,10 +3191,15 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) SetPropA(hwndCombo, LookInInfosStr, liInfos); + hdc = GetDC( hwndCombo ); + SelectObject( hdc, (HFONT)SendMessageW( hwndCombo, WM_GETFONT, 0, 0 )); + GetTextMetricsW( hdc, &tm ); + ReleaseDC( hwndCombo, hdc ); + /* set item height for both text field and listbox */ - CBSetItemHeight(hwndCombo,-1,GetSystemMetrics(SM_CYSMICON)); - CBSetItemHeight(hwndCombo,0,GetSystemMetrics(SM_CYSMICON)); - + CBSetItemHeight( hwndCombo, -1, max( tm.tmHeight, GetSystemMetrics(SM_CYSMICON) )); + CBSetItemHeight( hwndCombo, 0, max( tm.tmHeight, GetSystemMetrics(SM_CYSMICON) )); + /* Turn on the extended UI for the combo box like Windows does */ CBSetExtendedUI(hwndCombo, TRUE); @@ -3269,6 +3274,8 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) TEXTMETRICW tm; LPSFOLDER tmpFolder; LookInInfos *liInfos = GetPropA(pDIStruct->hwndItem,LookInInfosStr); + UINT shgfi_flags = SHGFI_PIDL | SHGFI_OPENICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME; + UINT icon_width, icon_height; TRACE("\n"); @@ -3280,25 +3287,24 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) return 0; + icon_width = GetSystemMetrics(SM_CXICON); + icon_height = GetSystemMetrics(SM_CYICON); + if (pDIStruct->rcItem.bottom - pDIStruct->rcItem.top < icon_height) + { + icon_width = GetSystemMetrics(SM_CXSMICON); + icon_height = GetSystemMetrics(SM_CYSMICON); + shgfi_flags |= SHGFI_SMALLICON; + } + if(pDIStruct->itemID == liInfos->uSelectedItem) { ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, - &sfi, - sizeof (sfi), - SHGFI_PIDL | SHGFI_SMALLICON | - SHGFI_OPENICON | SHGFI_SYSICONINDEX | - SHGFI_DISPLAYNAME ); + 0, &sfi, sizeof (sfi), shgfi_flags ); } else { ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, - &sfi, - sizeof (sfi), - SHGFI_PIDL | SHGFI_SMALLICON | - SHGFI_SYSICONINDEX | - SHGFI_DISPLAYNAME); + 0, &sfi, sizeof (sfi), shgfi_flags ); } /* Is this item selected ? */ @@ -3320,11 +3326,7 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) { iIndentation = 0; ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, - &sfi, - sizeof (sfi), - SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON - | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME ); + 0, &sfi, sizeof (sfi), shgfi_flags ); } else @@ -3334,17 +3336,17 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) /* Draw text and icon */ /* Initialise the icon display area */ - rectIcon.left = pDIStruct->rcItem.left + ICONWIDTH/2 * iIndentation; - rectIcon.top = pDIStruct->rcItem.top; - rectIcon.right = rectIcon.left + ICONWIDTH; - rectIcon.bottom = pDIStruct->rcItem.bottom; + rectIcon.left = pDIStruct->rcItem.left + 1 + icon_width/2 * iIndentation; + rectIcon.top = (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - icon_height) / 2; + rectIcon.right = rectIcon.left + icon_width + XTEXTOFFSET; + rectIcon.bottom = (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + icon_height) / 2; /* Initialise the text display area */ GetTextMetricsW(pDIStruct->hDC, &tm); rectText.left = rectIcon.right; rectText.top = (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - tm.tmHeight) / 2; - rectText.right = pDIStruct->rcItem.right + XTEXTOFFSET; + rectText.right = pDIStruct->rcItem.right; rectText.bottom = (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + tm.tmHeight) / 2; diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index ffe65c9..499ebb7 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -452,6 +452,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, /* Set view window control id to 5002 */ SetWindowLongPtrW(hwndView, GWLP_ID, lst2); + SendMessageW( hwndView, WM_SETFONT, SendMessageW( GetParent(hwndView), WM_GETFONT, 0, 0 ), FALSE ); /* Select the new folder in the Look In combo box of the Open file dialog */ FILEDLG95_LOOKIN_SelectItem(fodInfos->DlgInfos.hwndLookInCB,fodInfos->ShellInfos.pidlAbsCurrent);

1 0

Alexandre Julliard : shell32: Forward font messages to the listview window.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: ba486ca1b4abe8f81f81527647f90f85f91f1336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba486ca1b4abe8f81f8152764… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 17:59:43 2013 +0200 shell32: Forward font messages to the listview window. --- dlls/shell32/shlview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 7738694..2cdd160 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1717,6 +1717,8 @@ static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wPara break; case WM_GETDLGCODE: return SendMessageW(pThis->hWndList, uMessage, 0, 0); + case WM_SETFONT: return SendMessageW(pThis->hWndList, WM_SETFONT, wParam, lParam); + case WM_GETFONT: return SendMessageW(pThis->hWndList, WM_GETFONT, wParam, lParam); case WM_DESTROY: RevokeDragDrop(pThis->hWnd);

1 0