wined3d: Use strings for shader input/output semantics.
Henri Verbeet
hverbeet at codeweavers.com
Wed May 27 03:24:50 CDT 2009
---
dlls/wined3d/baseshader.c | 53 ++++++++-
dlls/wined3d/glsl_shader.c | 265 ++++++++++++++++++++--------------------
dlls/wined3d/pixelshader.c | 2 +-
dlls/wined3d/vertexshader.c | 2 +-
dlls/wined3d/wined3d_private.h | 9 +-
5 files changed, 190 insertions(+), 141 deletions(-)
diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index 91c656c..c5f364c 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
@@ -341,13 +341,58 @@ static unsigned int get_instr_extra_regcount(enum WINED3D_SHADER_INSTRUCTION_HAN
}
}
+static const char *shader_semantic_name_from_usage(WINED3DDECLUSAGE usage)
+{
+ static const char *semantic_names[] =
+ {
+ /* WINED3DDECLUSAGE_POSITION */ "POSITION",
+ /* WINED3DDECLUSAGE_BLENDWEIGHT */ "BLENDWEIGHT",
+ /* WINED3DDECLUSAGE_BLENDINDICES */ "BLENDINDICES",
+ /* WINED3DDECLUSAGE_NORMAL */ "NORMAL",
+ /* WINED3DDECLUSAGE_PSIZE */ "PSIZE",
+ /* WINED3DDECLUSAGE_TEXCOORD */ "TEXCOORD",
+ /* WINED3DDECLUSAGE_TANGENT */ "TANGENT",
+ /* WINED3DDECLUSAGE_BINORMAL */ "BINORMAL",
+ /* WINED3DDECLUSAGE_TESSFACTOR */ "TESSFACTOR",
+ /* WINED3DDECLUSAGE_POSITIONT */ "POSITIONT",
+ /* WINED3DDECLUSAGE_COLOR */ "COLOR",
+ /* WINED3DDECLUSAGE_FOG */ "FOG",
+ /* WINED3DDECLUSAGE_DEPTH */ "DEPTH",
+ /* WINED3DDECLUSAGE_SAMPLE */ "SAMPLE",
+ };
+
+ if (usage >= sizeof(semantic_names) / sizeof(*semantic_names))
+ {
+ FIXME("Unrecognized usage %#x\n", usage);
+ return "UNRECOGNIZED";
+ }
+
+ return semantic_names[usage];
+}
+
+BOOL shader_match_semantic(const char *semantic_name, WINED3DDECLUSAGE usage)
+{
+ return !strcmp(semantic_name, shader_semantic_name_from_usage(usage));
+}
+
+static void shader_signature_from_semantic(struct wined3d_shader_signature_element *e,
+ const struct wined3d_shader_semantic *s)
+{
+ e->semantic_name = shader_semantic_name_from_usage(s->usage);
+ e->semantic_idx = s->usage_idx;
+ e->sysval_semantic = 0;
+ e->component_type = 0;
+ e->register_idx = s->reg.reg.idx;
+ e->mask = s->reg.write_mask;
+}
+
/* Note that this does not count the loop register
* as an address register. */
HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe,
struct shader_reg_maps *reg_maps, struct wined3d_shader_attribute *attributes,
- struct wined3d_shader_semantic *semantics_in, struct wined3d_shader_semantic *semantics_out,
- const DWORD *byte_code, DWORD constf_size)
+ struct wined3d_shader_signature_element *input_signature,
+ struct wined3d_shader_signature_element *output_signature, const DWORD *byte_code, DWORD constf_size)
{
IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface;
void *fe_data = This->baseShader.frontend_data;
@@ -419,14 +464,14 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3
}
else
{
- semantics_in[semantic.reg.reg.idx] = semantic;
+ shader_signature_from_semantic(&input_signature[semantic.reg.reg.idx], &semantic);
}
break;
/* Vshader: mark 3.0 output registers used, save token */
case WINED3DSPR_OUTPUT:
reg_maps->output_registers |= 1 << semantic.reg.reg.idx;
- semantics_out[semantic.reg.reg.idx] = semantic;
+ shader_signature_from_semantic(&output_signature[semantic.reg.reg.idx], &semantic);
if (semantic.usage == WINED3DDECLUSAGE_FOG) reg_maps->fog = 1;
break;
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index c857398..f576e67 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -3177,7 +3177,7 @@ static void pshader_glsl_dp2add(const struct wined3d_shader_instruction *ins)
}
static void pshader_glsl_input_pack(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer,
- const struct wined3d_shader_semantic *semantics_in, const struct shader_reg_maps *reg_maps,
+ const struct wined3d_shader_signature_element *input_signature, const struct shader_reg_maps *reg_maps,
enum vertexprocessing_mode vertexprocessing)
{
unsigned int i;
@@ -3186,43 +3186,42 @@ static void pshader_glsl_input_pack(IWineD3DPixelShader *iface, SHADER_BUFFER *b
for (i = 0; map; map >>= 1, ++i)
{
- DWORD usage, usage_idx;
+ const char *semantic_name;
+ UINT semantic_idx;
char reg_mask[6];
/* Unused */
if (!(map & 1)) continue;
- usage = semantics_in[i].usage;
- usage_idx = semantics_in[i].usage_idx;
- shader_glsl_get_write_mask(&semantics_in[i].reg, reg_mask);
+ semantic_name = input_signature[i].semantic_name;
+ semantic_idx = input_signature[i].semantic_idx;
+ shader_glsl_write_mask_to_str(input_signature[i].mask, reg_mask);
- switch (usage)
+ if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_TEXCOORD))
{
- case WINED3DDECLUSAGE_TEXCOORD:
- if (usage_idx < 8 && vertexprocessing == pretransformed)
- shader_addline(buffer, "IN[%u]%s = gl_TexCoord[%u]%s;\n",
- This->input_reg_map[i], reg_mask, usage_idx, reg_mask);
- else
- shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n",
- This->input_reg_map[i], reg_mask, reg_mask);
- break;
-
- case WINED3DDECLUSAGE_COLOR:
- if (usage_idx == 0)
- shader_addline(buffer, "IN[%u]%s = vec4(gl_Color)%s;\n",
- This->input_reg_map[i], reg_mask, reg_mask);
- else if (usage_idx == 1)
- shader_addline(buffer, "IN[%u]%s = vec4(gl_SecondaryColor)%s;\n",
- This->input_reg_map[i], reg_mask, reg_mask);
- else
- shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n",
- This->input_reg_map[i], reg_mask, reg_mask);
- break;
-
- default:
+ if (semantic_idx < 8 && vertexprocessing == pretransformed)
+ shader_addline(buffer, "IN[%u]%s = gl_TexCoord[%u]%s;\n",
+ This->input_reg_map[i], reg_mask, semantic_idx, reg_mask);
+ else
shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n",
This->input_reg_map[i], reg_mask, reg_mask);
- break;
+ }
+ else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_COLOR))
+ {
+ if (semantic_idx == 0)
+ shader_addline(buffer, "IN[%u]%s = vec4(gl_Color)%s;\n",
+ This->input_reg_map[i], reg_mask, reg_mask);
+ else if (semantic_idx == 1)
+ shader_addline(buffer, "IN[%u]%s = vec4(gl_SecondaryColor)%s;\n",
+ This->input_reg_map[i], reg_mask, reg_mask);
+ else
+ shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n",
+ This->input_reg_map[i], reg_mask, reg_mask);
+ }
+ else
+ {
+ shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n",
+ This->input_reg_map[i], reg_mask, reg_mask);
}
}
}
@@ -3278,11 +3277,12 @@ static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const WineD
}
static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info, const DWORD *map,
- const struct wined3d_shader_semantic *semantics_in, const struct shader_reg_maps *reg_maps_in,
- const struct wined3d_shader_semantic *semantics_out, const struct shader_reg_maps *reg_maps_out)
+ const struct wined3d_shader_signature_element *input_signature, const struct shader_reg_maps *reg_maps_in,
+ const struct wined3d_shader_signature_element *output_signature, const struct shader_reg_maps *reg_maps_out)
{
unsigned int i, j;
- DWORD usage, usage_idx, usage_out, usage_idx_out;
+ const char *semantic_name_in, *semantic_name_out;
+ UINT semantic_idx_in, semantic_idx_out;
DWORD *set;
DWORD in_idx;
DWORD in_count = vec4_varyings(3, gl_info);
@@ -3292,7 +3292,8 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in
set = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*set) * (in_count + 2));
- if (!semantics_out) {
+ if (!output_signature)
+ {
/* Save gl_FrontColor & gl_FrontSecondaryColor before overwriting them. */
shader_addline(buffer, "vec4 front_color = gl_FrontColor;\n");
shader_addline(buffer, "vec4 front_secondary_color = gl_FrontSecondaryColor;\n");
@@ -3322,42 +3323,47 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in
sprintf(destination, "IN[%u]", in_idx);
}
- usage = semantics_in[i].usage;
- usage_idx = semantics_in[i].usage_idx;
- set[map[i]] = shader_glsl_get_write_mask(&semantics_in[i].reg, reg_mask);
-
- if(!semantics_out) {
- switch(usage) {
- case WINED3DDECLUSAGE_COLOR:
- if (usage_idx == 0)
- shader_addline(buffer, "%s%s = front_color%s;\n",
- destination, reg_mask, reg_mask);
- else if (usage_idx == 1)
- shader_addline(buffer, "%s%s = front_secondary_color%s;\n",
- destination, reg_mask, reg_mask);
- else
- shader_addline(buffer, "%s%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n",
- destination, reg_mask, reg_mask);
- break;
-
- case WINED3DDECLUSAGE_TEXCOORD:
- if (usage_idx < 8) {
- shader_addline(buffer, "%s%s = gl_TexCoord[%u]%s;\n",
- destination, reg_mask, usage_idx, reg_mask);
- } else {
- shader_addline(buffer, "%s%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n",
- destination, reg_mask, reg_mask);
- }
- break;
+ semantic_name_in = input_signature[i].semantic_name;
+ semantic_idx_in = input_signature[i].semantic_idx;
+ set[map[i]] = input_signature[i].mask;
+ shader_glsl_write_mask_to_str(input_signature[i].mask, reg_mask);
- case WINED3DDECLUSAGE_FOG:
- shader_addline(buffer, "%s%s = vec4(gl_FogFragCoord, 0.0, 0.0, 0.0)%s;\n",
- destination, reg_mask, reg_mask);
- break;
-
- default:
+ if (!output_signature)
+ {
+ if (shader_match_semantic(semantic_name_in, WINED3DDECLUSAGE_COLOR))
+ {
+ if (semantic_idx_in == 0)
+ shader_addline(buffer, "%s%s = front_color%s;\n",
+ destination, reg_mask, reg_mask);
+ else if (semantic_idx_in == 1)
+ shader_addline(buffer, "%s%s = front_secondary_color%s;\n",
+ destination, reg_mask, reg_mask);
+ else
+ shader_addline(buffer, "%s%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n",
+ destination, reg_mask, reg_mask);
+ }
+ else if (shader_match_semantic(semantic_name_in, WINED3DDECLUSAGE_TEXCOORD))
+ {
+ if (semantic_idx_in < 8)
+ {
+ shader_addline(buffer, "%s%s = gl_TexCoord[%u]%s;\n",
+ destination, reg_mask, semantic_idx_in, reg_mask);
+ }
+ else
+ {
shader_addline(buffer, "%s%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n",
- destination, reg_mask, reg_mask);
+ destination, reg_mask, reg_mask);
+ }
+ }
+ else if (shader_match_semantic(semantic_name_in, WINED3DDECLUSAGE_FOG))
+ {
+ shader_addline(buffer, "%s%s = vec4(gl_FogFragCoord, 0.0, 0.0, 0.0)%s;\n",
+ destination, reg_mask, reg_mask);
+ }
+ else
+ {
+ shader_addline(buffer, "%s%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n",
+ destination, reg_mask, reg_mask);
}
} else {
BOOL found = FALSE;
@@ -3367,14 +3373,15 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in
{
if (!(output_map & 1)) continue;
- usage_out = semantics_out[j].usage;
- usage_idx_out = semantics_out[j].usage_idx;
- shader_glsl_get_write_mask(&semantics_out[j].reg, reg_mask_out);
+ semantic_name_out = output_signature[j].semantic_name;
+ semantic_idx_out = output_signature[j].semantic_idx;
+ shader_glsl_write_mask_to_str(output_signature[i].mask, reg_mask_out);
- if(usage == usage_out &&
- usage_idx == usage_idx_out) {
+ if (semantic_idx_in == semantic_idx_out
+ && !strcmp(semantic_name_in, semantic_name_out))
+ {
shader_addline(buffer, "%s%s = OUT[%u]%s;\n",
- destination, reg_mask, j, reg_mask);
+ destination, reg_mask, j, reg_mask);
found = TRUE;
}
}
@@ -3441,9 +3448,10 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs
DWORD ps_major = ps ? ps->baseShader.reg_maps.shader_version.major : 0;
unsigned int i;
SHADER_BUFFER buffer;
- DWORD usage, usage_idx, writemask;
+ const char *semantic_name;
+ UINT semantic_idx;
char reg_mask[6];
- const struct wined3d_shader_semantic *semantics_out;
+ const struct wined3d_shader_signature_element *output_signature;
shader_buffer_init(&buffer);
@@ -3471,51 +3479,50 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs
WORD map = vs->baseShader.reg_maps.output_registers;
/* The vertex shader writes to its own varyings, the pixel shader needs them in the builtin ones */
- semantics_out = vs->semantics_out;
+ output_signature = vs->output_signature;
shader_addline(&buffer, "void order_ps_input(in vec4 OUT[%u]) {\n", MAX_REG_OUTPUT);
for (i = 0; map; map >>= 1, ++i)
{
- if (!(map & 1)) continue;
-
- usage = semantics_out[i].usage;
- usage_idx = semantics_out[i].usage_idx;
- writemask = shader_glsl_get_write_mask(&semantics_out[i].reg, reg_mask);
+ DWORD write_mask;
- switch(usage) {
- case WINED3DDECLUSAGE_COLOR:
- if (usage_idx == 0)
- shader_addline(&buffer, "gl_FrontColor%s = OUT[%u]%s;\n", reg_mask, i, reg_mask);
- else if (usage_idx == 1)
- shader_addline(&buffer, "gl_FrontSecondaryColor%s = OUT[%u]%s;\n", reg_mask, i, reg_mask);
- break;
-
- case WINED3DDECLUSAGE_POSITION:
- shader_addline(&buffer, "gl_Position%s = OUT[%u]%s;\n", reg_mask, i, reg_mask);
- break;
-
- case WINED3DDECLUSAGE_TEXCOORD:
- if (usage_idx < 8) {
- if(!(GLINFO_LOCATION).set_texcoord_w || ps_major > 0) writemask |= WINED3DSP_WRITEMASK_3;
-
- shader_addline(&buffer, "gl_TexCoord[%u]%s = OUT[%u]%s;\n",
- usage_idx, reg_mask, i, reg_mask);
- if(!(writemask & WINED3DSP_WRITEMASK_3)) {
- shader_addline(&buffer, "gl_TexCoord[%u].w = 1.0;\n", usage_idx);
- }
- }
- break;
+ if (!(map & 1)) continue;
- case WINED3DDECLUSAGE_PSIZE:
- shader_addline(&buffer, "gl_PointSize = OUT[%u].x;\n", i);
- break;
+ semantic_name = output_signature[i].semantic_name;
+ semantic_idx = output_signature[i].semantic_idx;
+ write_mask = output_signature[i].mask;
+ shader_glsl_write_mask_to_str(write_mask, reg_mask);
- case WINED3DDECLUSAGE_FOG:
- shader_addline(&buffer, "gl_FogFragCoord = OUT[%u].%c;\n", i, reg_mask[1]);
- break;
+ if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_COLOR))
+ {
+ if (semantic_idx == 0)
+ shader_addline(&buffer, "gl_FrontColor%s = OUT[%u]%s;\n", reg_mask, i, reg_mask);
+ else if (semantic_idx == 1)
+ shader_addline(&buffer, "gl_FrontSecondaryColor%s = OUT[%u]%s;\n", reg_mask, i, reg_mask);
+ }
+ else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_POSITION))
+ {
+ shader_addline(&buffer, "gl_Position%s = OUT[%u]%s;\n", reg_mask, i, reg_mask);
+ }
+ else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_TEXCOORD))
+ {
+ if (semantic_idx < 8)
+ {
+ if (!(GLINFO_LOCATION).set_texcoord_w || ps_major > 0) write_mask |= WINED3DSP_WRITEMASK_3;
- default:
- break;
+ shader_addline(&buffer, "gl_TexCoord[%u]%s = OUT[%u]%s;\n",
+ semantic_idx, reg_mask, i, reg_mask);
+ if (!(write_mask & WINED3DSP_WRITEMASK_3))
+ shader_addline(&buffer, "gl_TexCoord[%u].w = 1.0;\n", semantic_idx);
+ }
+ }
+ else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_PSIZE))
+ {
+ shader_addline(&buffer, "gl_PointSize = OUT[%u].x;\n", i);
+ }
+ else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_FOG))
+ {
+ shader_addline(&buffer, "gl_FogFragCoord = OUT[%u].%c;\n", i, reg_mask[1]);
}
}
shader_addline(&buffer, "}\n");
@@ -3523,7 +3530,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs
} else if(ps_major >= 3 && vs_major >= 3) {
WORD map = vs->baseShader.reg_maps.output_registers;
- semantics_out = vs->semantics_out;
+ output_signature = vs->output_signature;
/* This one is tricky: a 3.0 pixel shader reads from a 3.0 vertex shader */
shader_addline(&buffer, "varying vec4 IN[%u];\n", vec4_varyings(3, gl_info));
@@ -3534,27 +3541,22 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs
{
if (!(map & 1)) continue;
- usage = semantics_out[i].usage;
- usage_idx = semantics_out[i].usage_idx;
- shader_glsl_get_write_mask(&semantics_out[i].reg, reg_mask);
-
- switch(usage) {
- case WINED3DDECLUSAGE_POSITION:
- shader_addline(&buffer, "gl_Position%s = OUT[%u]%s;\n", reg_mask, i, reg_mask);
- break;
-
- case WINED3DDECLUSAGE_PSIZE:
- shader_addline(&buffer, "gl_PointSize = OUT[%u].x;\n", i);
- break;
+ semantic_name = output_signature[i].semantic_name;
+ shader_glsl_write_mask_to_str(output_signature[i].mask, reg_mask);
- default:
- break;
+ if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_POSITION))
+ {
+ shader_addline(&buffer, "gl_Position%s = OUT[%u]%s;\n", reg_mask, i, reg_mask);
+ }
+ else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_PSIZE))
+ {
+ shader_addline(&buffer, "gl_PointSize = OUT[%u].x;\n", i);
}
}
/* Then, fix the pixel shader input */
- handle_ps3_input(&buffer, gl_info, ps->input_reg_map,
- ps->semantics_in, &ps->baseShader.reg_maps, semantics_out, &vs->baseShader.reg_maps);
+ handle_ps3_input(&buffer, gl_info, ps->input_reg_map, ps->input_signature,
+ &ps->baseShader.reg_maps, output_signature, &vs->baseShader.reg_maps);
shader_addline(&buffer, "}\n");
} else if(ps_major >= 3 && vs_major < 3) {
@@ -3564,7 +3566,8 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs
* point size, but we depend on the optimizers kindness to find out that the pixel shader doesn't
* read gl_TexCoord and gl_ColorX, otherwise we'll run out of varyings
*/
- handle_ps3_input(&buffer, gl_info, ps->input_reg_map, ps->semantics_in, &ps->baseShader.reg_maps, NULL, NULL);
+ handle_ps3_input(&buffer, gl_info, ps->input_reg_map, ps->input_signature,
+ &ps->baseShader.reg_maps, NULL, NULL);
shader_addline(&buffer, "}\n");
} else {
ERR("Unexpected vertex and pixel shader version condition: vs: %d, ps: %d\n", vs_major, ps_major);
@@ -4186,7 +4189,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface,
/* Pack 3.0 inputs */
if (reg_maps->shader_version.major >= 3 && args->vp_mode != vertexshader)
{
- pshader_glsl_input_pack(iface, buffer, This->semantics_in, reg_maps, args->vp_mode);
+ pshader_glsl_input_pack(iface, buffer, This->input_signature, reg_maps, args->vp_mode);
}
/* Base Shader Body */
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 9ebe77b..839b9bb 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -243,7 +243,7 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i
/* Second pass: figure out which registers are used, what the semantics are, etc.. */
hr = shader_get_registers_used((IWineD3DBaseShader *)This, fe,
- reg_maps, NULL, This->semantics_in, NULL,
+ reg_maps, NULL, This->input_signature, NULL,
pFunction, GL_LIMITS(pshader_constantsF));
if (FAILED(hr)) return hr;
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index aceaa97..681ec35 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -277,7 +277,7 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader
This->min_rel_offset = GL_LIMITS(vshader_constantsF);
This->max_rel_offset = 0;
hr = shader_get_registers_used((IWineD3DBaseShader*) This, fe,
- reg_maps, This->attributes, NULL, This->semantics_out,
+ reg_maps, This->attributes, NULL, This->output_signature,
pFunction, GL_LIMITS(vshader_constantsF));
if (hr != WINED3D_OK) return hr;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index b68dc60..f136dd8 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2584,9 +2584,10 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer,
const shader_reg_maps *reg_maps, const DWORD *pFunction, void *backend_ctx);
HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe,
struct shader_reg_maps *reg_maps, struct wined3d_shader_attribute *attributes,
- struct wined3d_shader_semantic *semantics_in, struct wined3d_shader_semantic *semantics_out,
- const DWORD *byte_code, DWORD constf_size);
+ struct wined3d_shader_signature_element *input_signature,
+ struct wined3d_shader_signature_element *output_signature, const DWORD *byte_code, DWORD constf_size);
void shader_init(struct IWineD3DBaseShaderClass *shader, IWineD3DDevice *device);
+BOOL shader_match_semantic(const char *semantic_name, WINED3DDECLUSAGE usage);
const struct wined3d_shader_frontend *shader_select_frontend(DWORD version_token);
void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe_data, const DWORD *pFunction);
@@ -2679,7 +2680,7 @@ typedef struct IWineD3DVertexShaderImpl {
/* Vertex shader input and output semantics */
struct wined3d_shader_attribute attributes[MAX_ATTRIBS];
- struct wined3d_shader_semantic semantics_out[MAX_REG_OUTPUT];
+ struct wined3d_shader_signature_element output_signature[MAX_REG_OUTPUT];
UINT min_rel_offset, max_rel_offset;
UINT rel_offset;
@@ -2712,7 +2713,7 @@ typedef struct IWineD3DPixelShaderImpl {
IUnknown *parent;
/* Pixel shader input semantics */
- struct wined3d_shader_semantic semantics_in[MAX_REG_INPUT];
+ struct wined3d_shader_signature_element input_signature[MAX_REG_INPUT];
DWORD input_reg_map[MAX_REG_INPUT];
BOOL input_reg_used[MAX_REG_INPUT];
int declared_in_count;
--
1.6.0.6
--------------050201090701050808060808--
More information about the wine-patches
mailing list