marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Cleanup shader_glsl_get_output_register_swizzle().

oldstable
H. Verbeet 2006-12-29 15:31:26 +01:00 committed by Alexandre Julliard
parent 845cd590d2
commit 2b9a63b5d1
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/wined3d/glsl_shader.c
View File

@ -718,19 +718,19 @@ static void shader_glsl_get_register_name(
strcat(regstr, tmpStr);
}
/* Writes the GLSL writemask for the destination register */
static void shader_glsl_get_output_register_swizzle(
const DWORD param,
char *write_mask) {
*write_mask = 0;
/* Get the GLSL write mask for the destination register */
static void shader_glsl_get_write_mask(const DWORD param, char *write_mask) {
char *ptr = write_mask;
if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) {
strcat(write_mask, ".");
if (param & WINED3DSP_WRITEMASK_0) strcat(write_mask, "x");
if (param & WINED3DSP_WRITEMASK_1) strcat(write_mask, "y");
if (param & WINED3DSP_WRITEMASK_2) strcat(write_mask, "z");
if (param & WINED3DSP_WRITEMASK_3) strcat(write_mask, "w");
*ptr++ = '.';
if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x';
if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y';
if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z';
if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w';
}
*ptr = '\0';
}
static void shader_glsl_get_input_register_swizzle(
@ -804,7 +804,7 @@ static void shader_glsl_add_param(
shader_glsl_get_input_register_swizzle(param, is_color, reg_mask);
shader_glsl_gen_modifier(param, reg_name, reg_mask, out_str);
} else {
shader_glsl_get_output_register_swizzle(param, reg_mask);
shader_glsl_get_write_mask(param, reg_mask);
sprintf(out_str, "%s%s", reg_name, reg_mask);
}
}
@ -1788,7 +1788,7 @@ void pshader_glsl_input_pack(
if (!usage_token) continue;
usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT;
usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT;
shader_glsl_get_output_register_swizzle(register_token, reg_mask);
shader_glsl_get_write_mask(register_token, reg_mask);
switch(usage) {
@ -1843,7 +1843,7 @@ void vshader_glsl_output_unpack(
usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT;
usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT;
shader_glsl_get_output_register_swizzle(register_token, reg_mask);
shader_glsl_get_write_mask(register_token, reg_mask);
switch(usage) {