November 2006 - Wine-Commits

H. Verbeet : wined3d: Set the initial FBO depth stencil when creating the device.
by Alexandre Julliard Nov. 28, 2006

Nov. 28, 2006

Module: wine Branch: master Commit: 7e4d3d951e10a01b1374a66384ceca0769127bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4d3d951e10a01b1374a6638… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Nov 27 20:51:11 2006 +0100 wined3d: Set the initial FBO depth stencil when creating the device. --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f06b9cb..caac5a1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -79,6 +79,8 @@ static void WINAPI IWineD3DDeviceImpl_Ad static void WINAPI IWineD3DDeviceImpl_ApplyTextureUnitState(IWineD3DDevice *iface, DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type); +static void set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface *depth_stencil); + /* helper macros */ #define D3DMEMCHECK(object, ppResult) if(NULL == object) { *ppResult = NULL; WARN("Out of memory\n"); return WINED3DERR_OUTOFVIDEOMEMORY;} @@ -2090,6 +2092,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DSurface_AddRef(This->renderTarget); /* Depth Stencil support */ This->stencilBufferTarget = This->depthStencilBuffer; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + set_depth_stencil_fbo(iface, This->depthStencilBuffer); + } if (NULL != This->stencilBufferTarget) { IWineD3DSurface_AddRef(This->stencilBufferTarget); }

1 0

H. Verbeet : wined3d: Delete the device's FBO when destroying the device.
by Alexandre Julliard Nov. 28, 2006

Nov. 28, 2006

Module: wine Branch: master Commit: 9c1a61b6e62c0496163cba2e4fc02b11ce7212cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1a61b6e62c0496163cba2e4… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Nov 27 20:51:07 2006 +0100 wined3d: Delete the device's FBO when destroying the device. --- dlls/wined3d/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 340a0a5..f06b9cb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -566,6 +566,10 @@ static ULONG WINAPI IWineD3DDeviceImpl_R TRACE("(%p) : Releasing from %d\n", This, refCount + 1); if (!refCount) { + if (This->fbo) { + GL_EXTCALL(glDeleteFramebuffersEXT(1, &This->fbo)); + } + /* TODO: Clean up all the surfaces and textures! */ /* NOTE: You must release the parent if the object was created via a callback ** ***************************/

1 0

H. Verbeet : wined3d: Use the texture sampling function in a few more instructions (GLSL).
by Alexandre Julliard Nov. 28, 2006

Nov. 28, 2006

Module: wine Branch: master Commit: 533dcbf170e4cf17d9492196211733ceaf891e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533dcbf170e4cf17d94921962… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Nov 27 20:51:01 2006 +0100 wined3d: Use the texture sampling function in a few more instructions (GLSL). --- dlls/wined3d/glsl_shader.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 39ad693..b290f2f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1545,9 +1545,7 @@ void pshader_glsl_texm3x3pad(SHADER_OPCO } void pshader_glsl_texm3x2tex(SHADER_OPCODE_ARG* arg) { - - /* FIXME: Make this work for more than just 2D textures */ - + char dst_str[8]; DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; SHADER_BUFFER* buffer = arg->buffer; char src0_str[100]; @@ -1556,7 +1554,10 @@ void pshader_glsl_texm3x2tex(SHADER_OPCO shader_glsl_add_param(arg, arg->src[0], arg->src_addr[0], TRUE, src0_name, src0_mask, src0_str); shader_addline(buffer, "tmp0.y = dot(vec3(T%u), vec3(%s));\n", reg, src0_str); - shader_addline(buffer, "T%u = texture2D(Psampler%u, tmp0.st);\n", reg, reg); + + /* Sample the texture using the calculated coordinates */ + sprintf(dst_str, "T%u", reg); + shader_glsl_sample(arg, reg, dst_str, "tmp0"); } /** Process the WINED3DSIO_TEXM3X3TEX instruction in GLSL @@ -1604,6 +1605,7 @@ void pshader_glsl_texm3x3spec(SHADER_OPC IWineD3DPixelShaderImpl* shader = (IWineD3DPixelShaderImpl*) arg->shader; DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; char dimensions[5]; + char dst_str[8]; char src0_str[100], src0_name[50], src0_mask[6]; char src1_str[100], src1_name[50], src1_mask[6]; SHADER_BUFFER* buffer = arg->buffer; @@ -1630,8 +1632,8 @@ void pshader_glsl_texm3x3spec(SHADER_OPC shader_addline(buffer, "tmp0.xyz = reflect(-vec3(%s), vec3(tmp0));\n", src1_str); /* Sample the texture */ - shader_addline(buffer, "T%u = texture%s(Psampler%u, tmp0.%s);\n", - reg, dimensions, reg, (stype == WINED3DSTT_2D) ? "xy" : "xyz"); + sprintf(dst_str, "T%u", reg); + shader_glsl_sample(arg, reg, dst_str, "tmp0"); current_state->current_row = 0; } @@ -1643,6 +1645,7 @@ void pshader_glsl_texm3x3vspec(SHADER_OP DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; SHADER_BUFFER* buffer = arg->buffer; SHADER_PARSE_STATE* current_state = &shader->baseShader.parse_state; + char dst_str[8]; char src0_str[100], src0_name[50], src0_mask[6]; shader_glsl_add_param(arg, arg->src[0], arg->src_addr[0], TRUE, src0_name, src0_mask, src0_str); @@ -1660,14 +1663,9 @@ void pshader_glsl_texm3x3vspec(SHADER_OP shader_addline(buffer, "tmp0 = tmp0.w * tmp0;\n"); shader_addline(buffer, "tmp0 = (2.0 * tmp0) - tmp1;\n"); - /* FIXME: - * We don't really know if a Cube or a Volume texture is being sampled, but since Cube textures - * are used more commonly, we'll default to that. - * We probably need to push back the pixel shader generation code until drawPrimitive() for - * shader versions < 2.0, since that's the only time we can guarantee that we're sampling - * the correct type of texture because we can lookup what textures are bound at that point. - */ - shader_addline(buffer, "T%u = textureCube(Psampler%u, tmp0.xyz);\n", reg, reg); + /* Sample the texture using the calculated coordinates */ + sprintf(dst_str, "T%u", reg); + shader_glsl_sample(arg, reg, dst_str, "tmp0"); current_state->current_row = 0; }

1 0

H. Verbeet : wined3d: Use the texture sampling function in a few more instructions ( ARB asm shaders).
by Alexandre Julliard Nov. 28, 2006

Nov. 28, 2006

Module: wine Branch: master Commit: f035df9ac5fc7fe5113bb474fde8297cc4119e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f035df9ac5fc7fe5113bb474f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Nov 27 20:50:57 2006 +0100 wined3d: Use the texture sampling function in a few more instructions (ARB asm shaders). --- dlls/wined3d/arb_program_shader.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7c73fd4..75c22f5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -714,9 +714,12 @@ void pshader_hw_texreg2ar(SHADER_OPCODE_ DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; DWORD reg2 = arg->src[0] & WINED3DSP_REGNUM_MASK; + char dst_str[8]; + + sprintf(dst_str, "T%u", reg1); shader_addline(buffer, "MOV TMP.r, T%u.a;\n", reg2); shader_addline(buffer, "MOV TMP.g, T%u.r;\n", reg2); - shader_addline(buffer, "TEX T%u, TMP, texture[%u], 2D;\n", reg1, reg1); + shader_hw_sample(arg, reg1, dst_str, "TMP"); } void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { @@ -725,9 +728,12 @@ void pshader_hw_texreg2gb(SHADER_OPCODE_ DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; DWORD reg2 = arg->src[0] & WINED3DSP_REGNUM_MASK; + char dst_str[8]; + + sprintf(dst_str, "T%u", reg1); shader_addline(buffer, "MOV TMP.r, T%u.g;\n", reg2); shader_addline(buffer, "MOV TMP.g, T%u.b;\n", reg2); - shader_addline(buffer, "TEX T%u, TMP, texture[%u], 2D;\n", reg1, reg1); + shader_hw_sample(arg, reg1, dst_str, "TMP"); } void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { @@ -735,10 +741,12 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG SHADER_BUFFER* buffer = arg->buffer; DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; DWORD reg2 = arg->src[0] & WINED3DSP_REGNUM_MASK; + char dst_str[8]; /* FIXME: Should apply the BUMPMAPENV matrix */ + sprintf(dst_str, "T%u", reg1); shader_addline(buffer, "ADD TMP.rg, fragment.texcoord[%u], T%u;\n", reg1, reg2); - shader_addline(buffer, "TEX T%u, TMP, texture[%u], 2D;\n", reg1, reg1); + shader_hw_sample(arg, reg1, dst_str, "TMP"); } void pshader_hw_texm3x2pad(SHADER_OPCODE_ARG* arg) { @@ -755,11 +763,13 @@ void pshader_hw_texm3x2tex(SHADER_OPCODE DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; SHADER_BUFFER* buffer = arg->buffer; + char dst_str[8]; char src0_name[50]; + sprintf(dst_str, "T%u", reg); pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0_name); shader_addline(buffer, "DP3 TMP.y, T%u, %s;\n", reg, src0_name); - shader_addline(buffer, "TEX T%u, TMP, texture[%u], 2D;\n", reg, reg); + shader_hw_sample(arg, reg, dst_str, "TMP"); } void pshader_hw_texm3x3pad(SHADER_OPCODE_ARG* arg) { @@ -799,6 +809,7 @@ void pshader_hw_texm3x3vspec(SHADER_OPCO DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; SHADER_BUFFER* buffer = arg->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; + char dst_str[8]; char src0_name[50]; pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0_name); @@ -814,8 +825,9 @@ void pshader_hw_texm3x3vspec(SHADER_OPCO shader_addline(buffer, "MUL TMP, TMP.w, TMP;\n"); shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -TMP2;\n"); - /* Cubemap textures will be more used than 3D ones. */ - shader_addline(buffer, "TEX T%u, TMP, texture[%u], CUBE;\n", reg, reg); + /* Sample the texture using the calculated coordinates */ + sprintf(dst_str, "T%u", reg); + shader_hw_sample(arg, reg, dst_str, "TMP"); current_state->current_row = 0; } @@ -826,6 +838,7 @@ void pshader_hw_texm3x3spec(SHADER_OPCOD DWORD reg3 = arg->src[1] & WINED3DSP_REGNUM_MASK; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; SHADER_BUFFER* buffer = arg->buffer; + char dst_str[8]; char src0_name[50]; pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0_name); @@ -836,8 +849,9 @@ void pshader_hw_texm3x3spec(SHADER_OPCOD shader_addline(buffer, "MUL TMP, TMP.w, TMP;\n"); shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -C[%u];\n", reg3); - /* Cubemap textures will be more used than 3D ones. */ - shader_addline(buffer, "TEX T%u, TMP, texture[%u], CUBE;\n", reg, reg); + /* Sample the texture using the calculated coordinates */ + sprintf(dst_str, "T%u", reg); + shader_hw_sample(arg, reg, dst_str, "TMP"); current_state->current_row = 0; }

1 0

H. Verbeet : wined3d: Fix the texm3x3tex instruction to sample properly.
by Alexandre Julliard Nov. 28, 2006

Nov. 28, 2006

Module: wine Branch: master Commit: ac651a70589956d5d145728ec9de0fe1879c9451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac651a70589956d5d145728ec… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Nov 27 20:50:51 2006 +0100 wined3d: Fix the texm3x3tex instruction to sample properly. --- dlls/wined3d/arb_program_shader.c | 6 ++++-- dlls/wined3d/glsl_shader.c | 23 ++++++----------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9f2be9b..7c73fd4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -781,13 +781,15 @@ void pshader_hw_texm3x3tex(SHADER_OPCODE DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; SHADER_BUFFER* buffer = arg->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; + char dst_str[8]; char src0_name[50]; pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0_name); shader_addline(buffer, "DP3 TMP.z, T%u, %s;\n", reg, src0_name); - /* Cubemap textures will be more used than 3D ones. */ - shader_addline(buffer, "TEX T%u, TMP, texture[%u], CUBE;\n", reg, reg); + /* Sample the texture using the calculated coordinates */ + sprintf(dst_str, "T%u", reg); + shader_hw_sample(arg, reg, dst_str, "TMP"); current_state->current_row = 0; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6be71bb..39ad693 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1560,33 +1560,22 @@ void pshader_glsl_texm3x2tex(SHADER_OPCO } /** Process the WINED3DSIO_TEXM3X3TEX instruction in GLSL - * Perform the 3rd row of a 3x3 matrix multiply, then sample the texture using the calculate coordinates */ + * Perform the 3rd row of a 3x3 matrix multiply, then sample the texture using the calculated coordinates */ void pshader_glsl_texm3x3tex(SHADER_OPCODE_ARG* arg) { - + char dst_str[8]; char src0_str[100]; char src0_name[50]; char src0_mask[6]; - char dimensions[5]; DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; - DWORD src0_regnum = arg->src[0] & WINED3DSP_REGNUM_MASK; - DWORD stype = arg->reg_maps->samplers[src0_regnum] & WINED3DSP_TEXTURETYPE_MASK; IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; - - switch (stype) { - case WINED3DSTT_2D: strcpy(dimensions, "2D"); break; - case WINED3DSTT_CUBE: strcpy(dimensions, "Cube"); break; - case WINED3DSTT_VOLUME: strcpy(dimensions, "3D"); break; - default: - strcpy(dimensions, ""); - FIXME("Unrecognized sampler type: %#x\n", stype); - break; - } shader_glsl_add_param(arg, arg->src[0], arg->src_addr[0], TRUE, src0_name, src0_mask, src0_str); shader_addline(arg->buffer, "tmp0.z = dot(vec3(T%u), vec3(%s));\n", reg, src0_str); - shader_addline(arg->buffer, "T%u = texture%s(Psampler%u, tmp0.%s);\n", - reg, dimensions, reg, (stype == WINED3DSTT_2D) ? "xy" : "xyz"); + + /* Sample the texture using the calculated coordinates */ + sprintf(dst_str, "T%u", reg); + shader_glsl_sample(arg, reg, dst_str, "tmp0"); current_state->current_row = 0; }

1 0

H. Verbeet : wined3d: Create a separate function for sampling a texture.
by Alexandre Julliard Nov. 28, 2006

Nov. 28, 2006

Module: wine Branch: master Commit: e7122e9a79efd0e06b4be4107a62e5efc9295692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7122e9a79efd0e06b4be4107… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Nov 27 20:50:47 2006 +0100 wined3d: Create a separate function for sampling a texture. --- dlls/wined3d/arb_program_shader.c | 72 +++++++++++++++------------ dlls/wined3d/glsl_shader.c | 98 +++++++++++++++++------------------- 2 files changed, 85 insertions(+), 85 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a0d0d53..9f2be9b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -423,6 +423,44 @@ static void vshader_program_add_param(SH } } +static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const char *dst_str, const char *coord_reg) { + IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; + + SHADER_BUFFER* buffer = arg->buffer; + DWORD sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; + const char *tex_type; + + switch(sampler_type) { + case WINED3DSTT_1D: + tex_type = "1D"; + break; + + case WINED3DSTT_2D: + tex_type = "2D"; + break; + + case WINED3DSTT_VOLUME: + tex_type = "3D"; + break; + + case WINED3DSTT_CUBE: + tex_type = "CUBE"; + break; + + default: + ERR("Unexpected texture type %d\n", sampler_type); + tex_type = ""; + } + + if (deviceImpl->stateBlock->textureState[sampler_idx][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED) { + shader_addline(buffer, "TXP %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); + } else { + shader_addline(buffer, "TEX %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); + } +} + + static void pshader_gen_input_modifier_line ( SHADER_BUFFER* buffer, const DWORD instr, @@ -618,7 +656,6 @@ void pshader_hw_map2gl(SHADER_OPCODE_ARG void pshader_hw_tex(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; DWORD dst = arg->dst; DWORD* src = arg->src; @@ -627,10 +664,8 @@ void pshader_hw_tex(SHADER_OPCODE_ARG* a char reg_dest[40]; char reg_coord[40]; - const char *tex_type; DWORD reg_dest_code; DWORD reg_sampler_code; - DWORD sampler_type; /* All versions have a destination register */ reg_dest_code = dst & WINED3DSP_REGNUM_MASK; @@ -650,36 +685,7 @@ void pshader_hw_tex(SHADER_OPCODE_ARG* a else reg_sampler_code = src[1] & WINED3DSP_REGNUM_MASK; - sampler_type = arg->reg_maps->samplers[reg_sampler_code] & WINED3DSP_TEXTURETYPE_MASK; - switch(sampler_type) { - case WINED3DSTT_1D: - tex_type = "1D"; - break; - - case WINED3DSTT_2D: - tex_type = "2D"; - break; - - case WINED3DSTT_VOLUME: - tex_type = "3D"; - break; - - case WINED3DSTT_CUBE: - tex_type = "CUBE"; - break; - - default: - ERR("Unexpected texture type %d\n", sampler_type); - tex_type = "2D"; - } - - if (deviceImpl->stateBlock->textureState[reg_sampler_code][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED) { - shader_addline(buffer, "TXP %s, %s, texture[%u], %s;\n", - reg_dest, reg_coord, reg_sampler_code, tex_type); - } else { - shader_addline(buffer, "TEX %s, %s, texture[%u], %s;\n", - reg_dest, reg_coord, reg_sampler_code, tex_type); - } + shader_hw_sample(arg, reg_sampler_code, reg_dest, reg_coord); } void pshader_hw_texcoord(SHADER_OPCODE_ARG* arg) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 01b3b75..6be71bb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -855,6 +855,47 @@ static inline const char* shader_get_com } } +static void shader_glsl_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const char *dst_str, const char *coord_reg) { + IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; + DWORD sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; + const char sampler_prefix = shader_is_pshader_version(This->baseShader.hex_version) ? 'P' : 'V'; + SHADER_BUFFER* buffer = arg->buffer; + + if(deviceImpl->stateBlock->textureState[sampler_idx][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED) { + /* Note that there's no such thing as a projected cube texture. */ + switch(sampler_type) { + case WINED3DSTT_2D: + shader_addline(buffer, "%s = texture2DProj(%cshader%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); + break; + case WINED3DSTT_VOLUME: + shader_addline(buffer, "%s = texture3DProj(%cshader%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); + break; + default: + shader_addline(buffer, "%s = unrecognized_stype(%cshader%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); + FIXME("Unrecognized sampler type: %#x;\n", sampler_type); + break; + } + } else { + switch(sampler_type) { + case WINED3DSTT_2D: + shader_addline(buffer, "%s = texture2D(%csampler%u, %s.xy);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); + break; + case WINED3DSTT_CUBE: + shader_addline(buffer, "%s = textureCube(%csampler%u, %s.xyz);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); + break; + case WINED3DSTT_VOLUME: + shader_addline(buffer, "%s = texture3D(%csampler%u, %s.xyz);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); + break; + default: + shader_addline(buffer, "%s = unrecognized_stype(%csampler%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); + FIXME("Unrecognized sampler type: %#x;\n", sampler_type); + break; + } + } +} + + /***************************************************************************** * * Begin processing individual instruction opcodes @@ -1356,20 +1397,12 @@ void shader_glsl_callnz(SHADER_OPCODE_AR * Pixel Shader Specific Code begins here ********************************************/ void pshader_glsl_tex(SHADER_OPCODE_ARG* arg) { - - /* FIXME: Make this work for more than just 2D textures */ - IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; - SHADER_BUFFER* buffer = arg->buffer; DWORD hex_version = This->baseShader.hex_version; char dst_str[100], dst_reg[50], dst_mask[6]; char coord_str[100], coord_reg[50], coord_mask[6]; - char sampler_str[100], sampler_reg[50], sampler_mask[6]; - DWORD reg_dest_code = arg->dst & WINED3DSP_REGNUM_MASK; - DWORD sampler_code, sampler_type; /* All versions have a destination register */ shader_glsl_add_param(arg, arg->dst, 0, FALSE, dst_reg, dst_mask, dst_str); @@ -1381,53 +1414,14 @@ void pshader_glsl_tex(SHADER_OPCODE_ARG* else shader_glsl_add_param(arg, arg->src[0], arg->src_addr[0], TRUE, coord_reg, coord_mask, coord_str); - /* 1.0-1.4: Use destination register as coordinate source. - * 2.0+: Use provided coordinate source register. */ + /* 1.0-1.4: Use destination register as sampler source. + * 2.0+: Use provided sampler source. */ if (hex_version < WINED3DPS_VERSION(2,0)) { - sprintf(sampler_str, "Psampler%u", reg_dest_code); - sampler_code = reg_dest_code; - } - else { - shader_glsl_add_param(arg, arg->src[1], arg->src_addr[1], TRUE, sampler_reg, sampler_mask, sampler_str); - sampler_code = arg->src[1] & WINED3DSP_REGNUM_MASK; - } - - sampler_type = arg->reg_maps->samplers[sampler_code] & WINED3DSP_TEXTURETYPE_MASK; - if(deviceImpl->stateBlock->textureState[sampler_code][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED) { - switch(sampler_type) { - - case WINED3DSTT_2D: - shader_addline(buffer, "%s = texture2DProj(%s, %s);\n", dst_str, sampler_str, coord_reg); - break; - case WINED3DSTT_CUBE: - shader_addline(buffer, "%s = textureCubeProj(%s, %s);\n", dst_str, sampler_str, coord_reg); - break; - case WINED3DSTT_VOLUME: - shader_addline(buffer, "%s = texture3DProj(%s, %s);\n", dst_str, sampler_str, coord_reg); - break; - default: - shader_addline(buffer, "%s = unrecognized_stype(%s, %s.stp);\n", dst_str, sampler_str, coord_reg); - FIXME("Unrecognized sampler type: %#x;\n", sampler_type); - break; - } + shader_glsl_sample(arg, arg->dst & WINED3DSP_REGNUM_MASK, dst_str, coord_reg); } else { - switch(sampler_type) { - - case WINED3DSTT_2D: - shader_addline(buffer, "%s = texture2D(%s, %s.st);\n", dst_str, sampler_str, coord_reg); - break; - case WINED3DSTT_CUBE: - shader_addline(buffer, "%s = textureCube(%s, %s.stp);\n", dst_str, sampler_str, coord_reg); - break; - case WINED3DSTT_VOLUME: - shader_addline(buffer, "%s = texture3D(%s, %s.stp);\n", dst_str, sampler_str, coord_reg); - break; - default: - shader_addline(buffer, "%s = unrecognized_stype(%s, %s.stp);\n", dst_str, sampler_str, coord_reg); - FIXME("Unrecognized sampler type: %#x;\n", sampler_type); - break; - } + shader_glsl_sample(arg, arg->src[1] & WINED3DSP_REGNUM_MASK, dst_str, coord_reg); } + } void pshader_glsl_texcoord(SHADER_OPCODE_ARG* arg) {

1 0

H. Verbeet : wined3d: Select the right shader backend when creating the device.
by Alexandre Julliard Nov. 28, 2006

Nov. 28, 2006

Module: wine Branch: master Commit: 8a7f4279480bcc055248945702e04866e2722ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7f4279480bcc05524894570… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Nov 27 20:50:43 2006 +0100 wined3d: Select the right shader backend when creating the device. --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/drawprim.c | 22 ++++------------------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 368f384..5fc22d6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2438,6 +2438,13 @@ static HRESULT WINAPI IWineD3DImpl_Crea IWineD3DImpl_FillGLCaps(iface, IWineD3DImpl_GetAdapterDisplay(iface, Adapter)); LEAVE_GL(); select_shader_mode(&This->gl_info, DeviceType, &object->ps_selected_mode, &object->vs_selected_mode); + if (object->ps_selected_mode == SHADER_GLSL || object->vs_selected_mode == SHADER_GLSL) { + object->shader_backend = &glsl_shader_backend; + } else if (object->ps_selected_mode == SHADER_ARB || object->vs_selected_mode == SHADER_ARB) { + object->shader_backend = &arb_program_shader_backend; + } else { + object->shader_backend = &none_shader_backend; + } /* This function should *not* be modifying GL caps * TODO: move the functionality where it belongs */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 0c708c3..05e8f78 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1802,18 +1802,10 @@ inline static void drawPrimitiveDrawStri } /* Make any shaders active */ - if (This->vs_selected_mode == SHADER_GLSL || This->ps_selected_mode == SHADER_GLSL) { - glsl_shader_backend.shader_select(iface, usePixelShaderFunction, useVertexShaderFunction); - } else if (This->vs_selected_mode == SHADER_ARB || This->ps_selected_mode == SHADER_ARB) { - arb_program_shader_backend.shader_select(iface, usePixelShaderFunction, useVertexShaderFunction); - } + This->shader_backend->shader_select(iface, usePixelShaderFunction, useVertexShaderFunction); /* Load any global constants/uniforms that may have been set by the application */ - if (This->vs_selected_mode == SHADER_GLSL || This->ps_selected_mode == SHADER_GLSL) { - glsl_shader_backend.shader_load_constants(iface, usePixelShaderFunction, useVertexShaderFunction); - } else if (This->vs_selected_mode == SHADER_ARB || This->ps_selected_mode == SHADER_ARB) { - arb_program_shader_backend.shader_load_constants(iface, usePixelShaderFunction, useVertexShaderFunction); - } + This->shader_backend->shader_load_constants(iface, usePixelShaderFunction, useVertexShaderFunction); /* Draw vertex-by-vertex */ if (useDrawStridedSlow) @@ -1822,11 +1814,7 @@ inline static void drawPrimitiveDrawStri drawStridedFast(iface, numberOfIndicies, glPrimType, idxData, idxSize, minIndex, StartIdx); /* Cleanup any shaders */ - if (This->vs_selected_mode == SHADER_GLSL || This->ps_selected_mode == SHADER_GLSL) { - glsl_shader_backend.shader_cleanup(usePixelShaderFunction, useVertexShaderFunction); - } else if (This->vs_selected_mode == SHADER_ARB || This->ps_selected_mode == SHADER_ARB) { - arb_program_shader_backend.shader_cleanup(usePixelShaderFunction, useVertexShaderFunction); - } + This->shader_backend->shader_cleanup(usePixelShaderFunction, useVertexShaderFunction); /* Unload vertex data */ if (useVertexShaderFunction) { @@ -2046,7 +2034,6 @@ static void check_fbo_status(IWineD3DDev static void depth_blt(IWineD3DDevice *iface, GLuint texture) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - BOOL glsl_mode = This->vs_selected_mode == SHADER_GLSL || This->ps_selected_mode == SHADER_GLSL; glPushAttrib(GL_ENABLE_BIT | GL_DEPTH_BUFFER_BIT); @@ -2061,8 +2048,7 @@ static void depth_blt(IWineD3DDevice *if glBindTexture(GL_TEXTURE_2D, texture); glEnable(GL_TEXTURE_2D); - if (glsl_mode) glsl_shader_backend.shader_select_depth_blt(iface); - else arb_program_shader_backend.shader_select_depth_blt(iface); + This->shader_backend->shader_select_depth_blt(iface); glBegin(GL_TRIANGLE_STRIP); glVertex2f(-1.0f, -1.0f); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8db15e0..0776767 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -515,6 +515,7 @@ typedef struct IWineD3DDeviceImpl /* Selected capabilities */ int vs_selected_mode; int ps_selected_mode; + const shader_backend_t *shader_backend; /* Optimization */ BOOL modelview_valid;

1 0

H. Verbeet : wined3d: Move some code specific to the different shader backends into the respective source files .
by Alexandre Julliard Nov. 28, 2006

Nov. 28, 2006

Module: wine Branch: master Commit: df6f482a69d838e6624c117de8ce1e2564a4c980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6f482a69d838e6624c117de… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Nov 27 20:50:37 2006 +0100 wined3d: Move some code specific to the different shader backends into the respective source files. --- dlls/wined3d/arb_program_shader.c | 110 +++++++++++++++++++++ dlls/wined3d/baseshader.c | 12 +++ dlls/wined3d/drawprim.c | 197 ++++--------------------------------- dlls/wined3d/glsl_shader.c | 79 +++++++++++++++ dlls/wined3d/wined3d_private.h | 13 +++ 5 files changed, 233 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df6f482a69d838e6624c1…

1 0

Mike McCormack : msi: Use MSI_IterateRecords in ACTION_AppSearch.
by Alexandre Julliard Nov. 28, 2006

Nov. 28, 2006

Module: wine Branch: master Commit: 77b514fe24f3260f05530df29fada93e04a52e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b514fe24f3260f05530df29… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 28 17:46:25 2006 +0900 msi: Use MSI_IterateRecords in ACTION_AppSearch. --- dlls/msi/appsearch.c | 89 +++++++++++++++++++++----------------------------- 1 files changed, 37 insertions(+), 52 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index e5f0b04..4b65f65 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -844,65 +844,50 @@ static UINT ACTION_AppSearchSigName(MSIP return rc; } -/* http://msdn.microsoft.com/library/en-us/msi/setup/appsearch_table.asp - * is the best reference for the AppSearch table and how it's used. - */ -UINT ACTION_AppSearch(MSIPACKAGE *package) +static UINT iterate_appsearch(MSIRECORD *row, LPVOID param) { - MSIQUERY *view; - UINT rc; - static const WCHAR ExecSeqQuery[] = { - 's','e','l','e','c','t',' ','*',' ', - 'f','r','o','m',' ', - 'A','p','p','S','e','a','r','c','h',0}; + MSIPACKAGE *package = param; + LPWSTR propName, sigName, value = NULL; + MSISIGNATURE sig; + UINT r; - rc = MSI_OpenQuery(package->db, &view, ExecSeqQuery); - if (rc == ERROR_SUCCESS) - { - MSIRECORD *row = 0; - LPWSTR propName, sigName; + /* get property and signature */ + propName = msi_dup_record_field(row,1); + sigName = msi_dup_record_field(row,2); - rc = MSI_ViewExecute(view, 0); - if (rc != ERROR_SUCCESS) - goto end; + TRACE("%s %s\n", debugstr_w(propName), debugstr_w(sigName)); - while (!rc) - { - MSISIGNATURE sig; - LPWSTR value = NULL; - - rc = MSI_ViewFetch(view,&row); - if (rc != ERROR_SUCCESS) - { - rc = ERROR_SUCCESS; - break; - } + r = ACTION_AppSearchSigName(package, sigName, &sig, &value); + if (value) + { + MSI_SetPropertyW(package, propName, value); + msi_free(value); + } + ACTION_FreeSignature(&sig); + msi_free(propName); + msi_free(sigName); - /* get property and signature */ - propName = msi_dup_record_field(row,1); - sigName = msi_dup_record_field(row,2); + return r; +} - TRACE("Searching for Property %s, Signature_ %s\n", - debugstr_w(propName), debugstr_w(sigName)); +/* http://msdn.microsoft.com/library/en-us/msi/setup/appsearch_table.asp + * is the best reference for the AppSearch table and how it's used. + */ +UINT ACTION_AppSearch(MSIPACKAGE *package) +{ + static const WCHAR query[] = { + 's','e','l','e','c','t',' ','*',' ', + 'f','r','o','m',' ', + 'A','p','p','S','e','a','r','c','h',0}; + MSIQUERY *view = NULL; + UINT r; - rc = ACTION_AppSearchSigName(package, sigName, &sig, &value); - if (value) - { - MSI_SetPropertyW(package, propName, value); - msi_free(value); - } - ACTION_FreeSignature(&sig); - msi_free(propName); - msi_free(sigName); - msiobj_release(&row->hdr); - } + r = MSI_OpenQuery( package->db, &view, query ); + if (r != ERROR_SUCCESS) + return ERROR_SUCCESS; -end: - MSI_ViewClose(view); - msiobj_release(&view->hdr); - } - else - rc = ERROR_SUCCESS; + r = MSI_IterateRecords( view, NULL, iterate_appsearch, package ); + msiobj_release( &view->hdr ); - return rc; + return r; }

1 0

Mike McCormack : msi: Use MSI_QueryGetRecord in ACTION_AppSearchIni.
by Alexandre Julliard Nov. 28, 2006

Nov. 28, 2006

Module: wine Branch: master Commit: 63afb3f840e5d4b229f8fdfc3e424b40f92bac75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63afb3f840e5d4b229f8fdfc3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 28 17:45:46 2006 +0900 msi: Use MSI_QueryGetRecord in ACTION_AppSearchIni. --- dlls/msi/appsearch.c | 118 ++++++++++++++++++++------------------------------ 1 files changed, 47 insertions(+), 71 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 5c83fcc..e5f0b04 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -346,86 +346,62 @@ end: static UINT ACTION_AppSearchIni(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig) { - MSIQUERY *view; - UINT rc; - static const WCHAR ExecSeqQuery[] = { - 's','e','l','e','c','t',' ','*',' ', - 'f','r','o','m',' ', - 'I','n','i','L','o','c','a','t','o','r',' ', - 'w','h','e','r','e',' ','S','i','g','n','a','t','u','r','e','_',' ','=',' ', - '\'','%','s','\'',0}; + static const WCHAR query[] = { + 's','e','l','e','c','t',' ','*',' ', + 'f','r','o','m',' ', + 'I','n','i','L','o','c','a','t','o','r',' ', + 'w','h','e','r','e',' ', + 'S','i','g','n','a','t','u','r','e','_',' ','=',' ','\'','%','s','\'',0}; + MSIRECORD *row; + LPWSTR fileName, section, key; + int field, type; + WCHAR buf[MAX_PATH]; + + TRACE("%s\n", debugstr_w(sig->Name)); - TRACE("(package %p, appValue %p, sig %p)\n", package, appValue, sig); *appValue = NULL; - rc = MSI_OpenQuery(package->db, &view, ExecSeqQuery, sig->Name); - if (rc == ERROR_SUCCESS) - { - MSIRECORD *row = 0; - LPWSTR fileName, section, key; - int field, type; - WCHAR buf[MAX_PATH]; - rc = MSI_ViewExecute(view, 0); - if (rc != ERROR_SUCCESS) - { - TRACE("MSI_ViewExecute returned %d\n", rc); - goto end; - } - rc = MSI_ViewFetch(view,&row); - if (rc != ERROR_SUCCESS) - { - TRACE("MSI_ViewFetch returned %d\n", rc); - rc = ERROR_SUCCESS; - goto end; - } + row = MSI_QueryGetRecord( package->db, query, sig->Name ); + if (!row) + { + TRACE("failed to query IniLocator for %s\n", debugstr_w(sig->Name)); + return ERROR_SUCCESS; + } - fileName = msi_dup_record_field(row, 2); - section = msi_dup_record_field(row, 3); - key = msi_dup_record_field(row, 4); - if ((field = MSI_RecordGetInteger(row, 5)) == MSI_NULL_INTEGER) - field = 0; - if ((type = MSI_RecordGetInteger(row, 6)) == MSI_NULL_INTEGER) - type = 0; - - GetPrivateProfileStringW(section, key, NULL, buf, - sizeof(buf) / sizeof(WCHAR), fileName); - if (buf[0]) + fileName = msi_dup_record_field(row, 2); + section = msi_dup_record_field(row, 3); + key = msi_dup_record_field(row, 4); + field = MSI_RecordGetInteger(row, 5); + type = MSI_RecordGetInteger(row, 6); + if (field == MSI_NULL_INTEGER) + field = 0; + if (type == MSI_NULL_INTEGER) + type = 0; + + GetPrivateProfileStringW(section, key, NULL, buf, MAX_PATH, fileName); + if (buf[0]) + { + switch (type & 0x0f) { - switch (type & 0x0f) - { - case msidbLocatorTypeDirectory: - FIXME("unimplemented for type Directory (dir: %s)\n", - debugstr_w(buf)); - break; - case msidbLocatorTypeFileName: - FIXME("unimplemented for type File (file: %s)\n", - debugstr_w(buf)); - break; - case msidbLocatorTypeRawValue: - *appValue = strdupW(buf); - break; - } + case msidbLocatorTypeDirectory: + FIXME("unimplemented for Directory (%s)\n", debugstr_w(buf)); + break; + case msidbLocatorTypeFileName: + FIXME("unimplemented for File (%s)\n", debugstr_w(buf)); + break; + case msidbLocatorTypeRawValue: + *appValue = strdupW(buf); + break; } - - msi_free(fileName); - msi_free(section); - msi_free(key); - -end: - if (row) - msiobj_release(&row->hdr); - MSI_ViewClose(view); - msiobj_release(&view->hdr); - } - else - { - TRACE("MSI_OpenQuery returned %d\n", rc); - rc = ERROR_SUCCESS; } + msi_free(fileName); + msi_free(section); + msi_free(key); - TRACE("returning %d\n", rc); - return rc; + msiobj_release(&row->hdr); + + return ERROR_SUCCESS; } /* Expands the value in src into a path without property names and only

1 0