Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
b0bc24ee
Commit
b0bc24ee
authored
Dec 13, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 14, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass implementation pointers to generate_param_reorder_function().
parent
77beea98
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
5 deletions
+2
-5
glsl_shader.c
dlls/wined3d/glsl_shader.c
+2
-5
No files found.
dlls/wined3d/glsl_shader.c
View file @
b0bc24ee
...
...
@@ -3830,11 +3830,9 @@ static void handle_ps3_input(struct wined3d_shader_buffer *buffer,
/* GL locking is done by the caller */
static
GLhandleARB
generate_param_reorder_function
(
struct
wined3d_shader_buffer
*
buffer
,
IWineD3DVertexShader
*
vertexshader
,
IWineD3DPixelShader
*
pixelshader
,
const
struct
wined3d_gl_info
*
gl_info
)
IWineD3DVertexShader
Impl
*
vs
,
IWineD3DPixelShaderImpl
*
ps
,
const
struct
wined3d_gl_info
*
gl_info
)
{
GLhandleARB
ret
=
0
;
IWineD3DVertexShaderImpl
*
vs
=
(
IWineD3DVertexShaderImpl
*
)
vertexshader
;
IWineD3DPixelShaderImpl
*
ps
=
(
IWineD3DPixelShaderImpl
*
)
pixelshader
;
DWORD
ps_major
=
ps
?
ps
->
baseShader
.
reg_maps
.
shader_version
.
major
:
0
;
unsigned
int
i
;
const
char
*
semantic_name
;
...
...
@@ -4338,8 +4336,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context,
WORD
map
=
vshader
->
baseShader
.
reg_maps
.
input_registers
;
char
tmp_name
[
10
];
reorder_shader_id
=
generate_param_reorder_function
(
&
priv
->
shader_buffer
,
(
IWineD3DVertexShader
*
)
vshader
,
(
IWineD3DPixelShader
*
)
pshader
,
gl_info
);
reorder_shader_id
=
generate_param_reorder_function
(
&
priv
->
shader_buffer
,
vshader
,
pshader
,
gl_info
);
TRACE
(
"Attaching GLSL shader object %u to program %u
\n
"
,
reorder_shader_id
,
programId
);
GL_EXTCALL
(
glAttachObjectARB
(
programId
,
reorder_shader_id
));
checkGLcall
(
"glAttachObjectARB"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment