ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Get rid of the tex_op_args typedef.

This commit is contained in:
Henri Verbeet 2011-07-03 22:27:22 +02:00 committed by Alexandre Julliard
parent b1664a2c85
commit 82d74d563a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/wined3d/nvidia_texture_shader.c
View File

@ -70,11 +70,12 @@ static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD st
} }
} }
typedef struct { struct tex_op_args
{
GLenum input[3]; GLenum input[3];
GLenum mapping[3]; GLenum mapping[3];
GLenum component_usage[3]; GLenum component_usage[3];
} tex_op_args; };
static GLenum d3dta_to_combiner_input(DWORD d3dta, DWORD stage, INT texture_idx) { static GLenum d3dta_to_combiner_input(DWORD d3dta, DWORD stage, INT texture_idx) {
switch (d3dta) { switch (d3dta) {
@ -134,7 +135,7 @@ static void get_src_and_opr_nvrc(DWORD stage, DWORD arg, BOOL is_alpha, GLenum*
void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, BOOL is_alpha, void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, BOOL is_alpha,
int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst) int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst)
{ {
tex_op_args tex_op_args = {{0}, {0}, {0}}; struct tex_op_args tex_op_args = {{0}, {0}, {0}};
GLenum portion = is_alpha ? GL_ALPHA : GL_RGB; GLenum portion = is_alpha ? GL_ALPHA : GL_RGB;
GLenum target = GL_COMBINER0_NV + stage; GLenum target = GL_COMBINER0_NV + stage;
GLenum output; GLenum output;