June 2006 - Wine-commits - list.winehq.org

Ivan Gyurdiev : wined3d: Keep pshader and vshader constants in GLSL separate.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: 14a52e5c0999a023b2041e569cc0a1b2dc7ed542 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=14a52e5c0999a023b2041e5… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jun 12 03:00:03 2006 -0400 wined3d: Keep pshader and vshader constants in GLSL separate. GLSL uniforms have as scope the entire program. To prevent conflicts, name pshader and vshader constants differently. Based on a patch by Jason Green. --- dlls/wined3d/baseshader.c | 5 ++++- dlls/wined3d/drawprim.c | 14 +++++++++----- dlls/wined3d/glsl_shader.c | 20 ++++++++++++++------ 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 7771b79..36cb604 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -725,7 +725,10 @@ void shader_generate_glsl_declarations( char pshader = shader_is_pshader_version(This->baseShader.hex_version); /* Declare the constants (aka uniforms) */ - shader_addline(buffer, "uniform vec4 C[%u];\n", This->baseShader.limits.constant_float); + if (pshader) + shader_addline(buffer, "uniform vec4 PC[%u];\n", This->baseShader.limits.constant_float); + else + shader_addline(buffer, "uniform vec4 VC[%u];\n", This->baseShader.limits.constant_float); /* Declare texture samplers */ for (i = 0; i < This->baseShader.limits.sampler; i++) { diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index a4715e7..08afebe 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1723,7 +1723,8 @@ void drawPrimLoadPSamplersGLSL( void drawPrimLoadConstantsGLSL_F(IWineD3DDevice* iface, unsigned max_constants, float* constants, - BOOL* constants_set) { + BOOL* constants_set, + char is_pshader) { IWineD3DDeviceImpl* This = (IWineD3DDeviceImpl *)iface; GLhandleARB programId = This->stateBlock->shaderPrgId; @@ -1738,12 +1739,15 @@ void drawPrimLoadConstantsGLSL_F(IWineD3 for (i=0; i<max_constants; ++i) { if (NULL == constants_set || constants_set[i]) { + + const char* prefix = is_pshader? "PC":"VC"; + TRACE_(d3d_shader)("Loading constants %i: %f, %f, %f, %f\n", i, constants[i*4], constants[i*4+1], constants[i*4+2], constants[i*4+3]); /* TODO: Benchmark and see if it would be beneficial to store the * locations of the constants to avoid looking up each time */ - snprintf(tmp_name, sizeof(tmp_name), "C[%i]", i); + snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, i); tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); if (tmp_loc != -1) { /* We found this uniform name in the program - go ahead and send the data */ @@ -1798,13 +1802,13 @@ void drawPrimLoadConstants(IWineD3DDevic if (NULL != vertexDeclaration && NULL != vertexDeclaration->constants) { /* Load DirectX 8 float constants/uniforms for vertex shader */ drawPrimLoadConstantsGLSL_F(iface, WINED3D_VSHADER_MAX_CONSTANTS, - vertexDeclaration->constants, NULL); + vertexDeclaration->constants, NULL, 0); } /* Load DirectX 9 float constants/uniforms for vertex shader */ drawPrimLoadConstantsGLSL_F(iface, WINED3D_VSHADER_MAX_CONSTANTS, This->stateBlock->vertexShaderConstantF, - This->stateBlock->set.vertexShaderConstantsF); + This->stateBlock->set.vertexShaderConstantsF, 0); /* TODO: Load boolean & integer constants for vertex shader */ } @@ -1816,7 +1820,7 @@ void drawPrimLoadConstants(IWineD3DDevic /* Load DirectX 9 float constants/uniforms for pixel shader */ drawPrimLoadConstantsGLSL_F(iface, WINED3D_PSHADER_MAX_CONSTANTS, This->stateBlock->pixelShaderConstantF, - This->stateBlock->set.pixelShaderConstantsF); + This->stateBlock->set.pixelShaderConstantsF, 1); /* TODO: Load boolean & integer constants for pixel shader */ } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 32b7f9c..3661d06 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -205,6 +205,9 @@ static void shader_glsl_get_register_nam } break; case D3DSPR_CONST: + { + const char* prefix = pshader? "PC":"VC"; + if (arg->reg_maps->constantsF[reg]) { /* Use a local constant declared by "dcl" */ @@ -214,7 +217,7 @@ static void shader_glsl_get_register_nam * local constant. */ FIXME("Relative addressing not yet supported on named constants\n"); } else { - sprintf(tmpStr, "C%lu", reg); + sprintf(tmpStr, "%s%lu", prefix, reg); } } else { /* Use a global constant declared in Set____ShaderConstantF() */ @@ -224,16 +227,17 @@ static void shader_glsl_get_register_nam if (D3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 2) { char relStr[100], relReg[50], relMask[6]; shader_glsl_add_param(arg, addr_token, 0, TRUE, relReg, relMask, relStr); - sprintf(tmpStr, "C[%s + %lu]", relStr, reg); + sprintf(tmpStr, "%s[%s + %lu]", prefix, relStr, reg); } else { - sprintf(tmpStr, "C[A0.x + %lu]", reg); + sprintf(tmpStr, "%s[A0.x + %lu]", prefix, reg); } } else { /* Just a normal global constant - no relative addressing */ - sprintf(tmpStr, "C[%lu]", reg); + sprintf(tmpStr, "%s[%lu]", prefix, reg); } } - break; + break; + } case D3DSPR_TEXTURE: /* case D3DSPR_ADDR: */ if (pshader) { sprintf(tmpStr, "T%lu", reg); @@ -710,8 +714,12 @@ void shader_glsl_def(SHADER_OPCODE_ARG* DWORD reg = arg->dst & D3DSP_REGNUM_MASK; + IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) arg->shader; + char pshader = shader_is_pshader_version(This->baseShader.hex_version); + const char* prefix = pshader? "PC":"VC"; + shader_addline(arg->buffer, - "const vec4 C%lu = { %f, %f, %f, %f };\n", reg, + "const vec4 %s%lu = { %f, %f, %f, %f };\n", prefix, reg, *((const float *)(arg->src + 0)), *((const float *)(arg->src + 1)), *((const float *)(arg->src + 2)),

1 0

Ivan Gyurdiev : wined3d: Improve Sampler support on 2.0 and 3.0 shaders.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: 0d08316523590156b990dc48e6754ae0a74e1439 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d08316523590156b990dc4… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jun 12 02:59:16 2006 -0400 wined3d: Improve Sampler support on 2.0 and 3.0 shaders. - track sampler declarations and store the sampler usage in reg_maps structure - store a fake sampler usage for 1.X shaders (defined as 2D sampler) - re-sync glsl TEX implementation with the ARB one (no idea why they diverged..) - use sampler type in new TEX implementation to support 2D, 3D, and Cube sampling - change drawprim to bind pixel shader samplers Additional improvements: - rename texture limit to texcoord to prevent confusion - add sampler limit, and use that for samplers - *not* the same as texcoord above --- dlls/wined3d/baseshader.c | 65 ++++++++++++++++++++++++++++++++-------- dlls/wined3d/drawprim.c | 33 ++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 61 +++++++++++++++++++++++++------------- dlls/wined3d/pixelshader.c | 23 +++++++++----- dlls/wined3d/vertexshader.c | 10 ++++-- dlls/wined3d/wined3d_private.h | 9 +++++- 6 files changed, 155 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0d08316523590156b99…

1 0

Ivan Gyurdiev : wined3d: Add support for shader model 3.0 I/O registers.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: a1f4dfe4e37e8d18a444ccf3cf333550659b57d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1f4dfe4e37e8d18a444ccf… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jun 12 02:57:07 2006 -0400 wined3d: Add support for shader model 3.0 I/O registers. SM 3.0 can pack multiple "semantics" into 12 generic input/output registers. To support that, define temporaries called IN and OUT, and use those as the output registers. At the end of the vshader, unpack the OUT temps into the proper GL variables. At the beginning of the pshader, pack the GL variables back into 12 IN registers. --- dlls/wined3d/baseshader.c | 15 +++++ dlls/wined3d/glsl_shader.c | 132 ++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/pixelshader.c | 10 +++ dlls/wined3d/vertexshader.c | 9 +++ dlls/wined3d/wined3d_private.h | 15 +++++ 5 files changed, 176 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a1f4dfe4e37e8d18a44…

1 0

Ivan Gyurdiev : wined3d: Cast more things.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: e99926ee06b5696d69d6e04dafc0651f32c07694 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e99926ee06b5696d69d6e04… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jun 12 02:58:09 2006 -0400 wined3d: Cast more things. Anything with a swizzle has to be casted to vec4, or it won't work properly. There's multiple ways to do this, for the moment pick the easiest one. --- dlls/wined3d/glsl_shader.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 017fe5e..bed5b98 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -417,7 +417,9 @@ void shader_glsl_arith(SHADER_OPCODE_ARG shader_glsl_add_param(arg, arg->src[0], arg->src_addr[0], TRUE, src0_reg, src0_mask, src0_str); shader_glsl_add_param(arg, arg->src[1], arg->src_addr[1], TRUE, src1_reg, src1_mask, src1_str); shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + strcat(tmpLine, "vec4("); strcat(tmpLine, src0_str); + strcat(tmpLine, ")"); /* Determine the GLSL operator to use based on the opcode */ switch (curOpcode->opcode) { @@ -428,7 +430,7 @@ void shader_glsl_arith(SHADER_OPCODE_ARG FIXME("Opcode %s not yet handled in GLSL\n", curOpcode->name); break; } - shader_addline(buffer, "%s%s)%s;\n", tmpLine, src1_str, dst_mask); + shader_addline(buffer, "%svec4(%s))%s;\n", tmpLine, src1_str, dst_mask); } /* Process the D3DSIO_MOV opcode using GLSL (dst = src) */ @@ -512,12 +514,15 @@ void shader_glsl_map2gl(SHADER_OPCODE_AR strcat(tmpLine, "("); if (curOpcode->num_params > 0) { + strcat(tmpLine, "vec4("); shader_glsl_add_param(arg, arg->src[0], arg->src_addr[0], TRUE, src_reg, src_mask, src_str); strcat(tmpLine, src_str); + strcat(tmpLine, ")"); for (i = 2; i < curOpcode->num_params; ++i) { - strcat(tmpLine, ", "); + strcat(tmpLine, ", vec4("); shader_glsl_add_param(arg, arg->src[i-1], arg->src_addr[i-1], TRUE, src_reg, src_mask, src_str); strcat(tmpLine, src_str); + strcat(tmpLine, ")"); } } shader_addline(buffer, "%s))%s;\n", tmpLine, dst_mask); @@ -620,7 +625,7 @@ void shader_glsl_mad(SHADER_OPCODE_ARG* shader_glsl_add_param(arg, arg->src[2], arg->src_addr[2], TRUE, src2_reg, src2_mask, src2_str); shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); - shader_addline(arg->buffer, "%s((%s) * (%s)) + (%s))%s;\n", + shader_addline(arg->buffer, "%s(vec4(%s) * vec4(%s)) + vec4(%s))%s;\n", tmpLine, src0_str, src1_str, src2_str, dst_mask); }

1 0

Ivan Gyurdiev : wined3d: Trivial cleanups
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: 1a3003338f2f216c82df19a832297e17f0f5f318 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a3003338f2f216c82df19a… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jun 12 02:56:13 2006 -0400 wined3d: Trivial cleanups - compiler warnings and errors should be FIXME - remove obsolete comment, and change variable type. --- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/pixelshader.c | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index afcec1c..9cc3f2b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -42,7 +42,7 @@ void print_glsl_info_log(WineD3D_GL_Info { infoLog = (char *)HeapAlloc(GetProcessHeap(), 0, infologLength); GL_EXTCALL(glGetInfoLogARB(obj, infologLength, NULL, infoLog)); - TRACE("Error received from GLSL shader #%u: %s\n", obj, debugstr_a(infoLog)); + FIXME("Error received from GLSL shader #%u: %s\n", obj, debugstr_a(infoLog)); HeapFree(GetProcessHeap(), 0, infoLog); } } @@ -166,7 +166,7 @@ static void shader_glsl_get_register_nam DWORD reg = param & D3DSP_REGNUM_MASK; DWORD regtype = shader_get_regtype(param); IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) arg->shader; - BOOL pshader = shader_is_pshader_version(This->baseShader.hex_version); + char pshader = shader_is_pshader_version(This->baseShader.hex_version); char tmpStr[50]; *is_color = FALSE; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 7312811..cf01e50 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -83,12 +83,6 @@ static ULONG WINAPI IWineD3DPixelShader return ref; } -/* TODO: At the momeny the function parser is single pass, it achievs this - by passing constants to a couple of functions where they are then modified. - At some point the parser need to be made two pass (So that GLSL can be used if it's required by the shader) - when happens constants should be worked out in the first pass to tidy up the second pass a bit. -*/ - /* ******************************************* IWineD3DPixelShader IWineD3DPixelShader parts follow ******************************************* */

1 0

Ivan Gyurdiev : wined3d: Register map cleanups.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: a42925ee090e6992b6ecef2dc5d5710cd0e8a9de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a42925ee090e6992b6ecef2… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jun 12 02:55:30 2006 -0400 wined3d: Register map cleanups. Various cleanups: - do not use DWORD as a bitmask, that places artificial limit of 32 on registers - track attributes that are used and declare only those - move declarations function call in pshader/vshader to allow us to insert pixel or vertex specific code between the declarations and the rest of the code - remove redundant 0 intializers - remove useless continue statement --- dlls/wined3d/baseshader.c | 64 +++++++++++++++++++--------------------- dlls/wined3d/pixelshader.c | 6 ++++ dlls/wined3d/vertexshader.c | 6 ++++ dlls/wined3d/wined3d_private.h | 32 ++++++++++++++++---- 4 files changed, 67 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a42925ee090e6992b6e…

1 0

Ivan Gyurdiev : wined3d: Share trace pass
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: 17b0d26c1e06cf78d93cfc9bdbe618f456e196b1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17b0d26c1e06cf78d93cfc9… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jun 12 02:54:30 2006 -0400 wined3d: Share trace pass Now that the declaration function is out of the way, the tracing pass, which is very long and 100% the same can be shared between pixel and vertex shaders. The new function is called shader_trace_init(), and is responsible for: - tracing the shader - initializing the function length - setting the shader version [needed very early] --- dlls/wined3d/baseshader.c | 147 +++++++++++++++++++++++++++++- dlls/wined3d/glsl_shader.c | 18 ++-- dlls/wined3d/pixelshader.c | 196 ++++++---------------------------------- dlls/wined3d/vertexshader.c | 165 +++------------------------------- dlls/wined3d/wined3d_private.h | 9 +- 5 files changed, 199 insertions(+), 336 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=17b0d26c1e06cf78d93…

1 0

Ivan Gyurdiev : wined3d: The namedArrays code path is dead (always FALSE).
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: f144d58ac27ca019304f7d23ee2c8506a213d6e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f144d58ac27ca019304f7d2… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jun 12 02:51:58 2006 -0400 wined3d: The namedArrays code path is dead (always FALSE). Delete the entire namedArrays code path and all its dependencies (one of which is quite long - storeOrder in drawprim is always FALSE, for example). Delete declaredArrays, and make its code path the default. --- dlls/wined3d/baseshader.c | 23 ++++---- dlls/wined3d/drawprim.c | 68 +++++++++------------- dlls/wined3d/glsl_shader.c | 8 --- dlls/wined3d/vertexshader.c | 121 +--------------------------------------- dlls/wined3d/wined3d_private.h | 6 +- 5 files changed, 43 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f144d58ac27ca019304…

1 0

Ivan Gyurdiev : wined3d: Rework dcl processing.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: 9bae7755ab1f3983980306d8c94c86af4c9e7bb2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9bae7755ab1f3983980306d… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jun 12 02:53:32 2006 -0400 wined3d: Rework dcl processing. The new function is called in pass 2 (getister counting/maps), and it's now in baseshader. It operates on all INPUT and OUTPUT registers, which, in addition to the old vertex shader input declarations covers Shader Model 3.0 vshader output and pshader input declarations. The result is stored into the reg_map structure. --- dlls/wined3d/baseshader.c | 157 +++++++++++++++++++++++++++++++++++----- dlls/wined3d/drawprim.c | 24 ++++-- dlls/wined3d/glsl_shader.c | 21 ++++- dlls/wined3d/pixelshader.c | 20 ++++- dlls/wined3d/vertexshader.c | 145 +++++++------------------------------ dlls/wined3d/wined3d_private.h | 15 +++- 6 files changed, 224 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9bae7755ab1f3983980…

1 0

Michael Stefaniuc : include: The visibility attribute is supported only by gcc >= 3.3.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: 3f46314e33cffd9ea7376adf3aef048747b70c47 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f46314e33cffd9ea7376ad… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 13 00:52:00 2006 +0200 include: The visibility attribute is supported only by gcc >= 3.3. --- include/winnt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index d2c6452..77bf11e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -136,13 +136,13 @@ #ifdef _MSC_VER # define DECLSPEC_EXPORT __declspec(dllexport) #elif defined(__MINGW32__) # define DECLSPEC_EXPORT __attribute__((dllexport)) -#elif defined(__GNUC__) && (__GNUC__ > 2) +#elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) # define DECLSPEC_EXPORT __attribute__((visibility ("default"))) #else # define DECLSPEC_EXPORT #endif -#if defined(__GNUC__) && (__GNUC__ > 2) +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) # define DECLSPEC_HIDDEN __attribute__((visibility ("hidden"))) #else # define DECLSPEC_HIDDEN

1 0