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
78652a5f
Commit
78652a5f
authored
Dec 05, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 06, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Explicitly pass shader_data, reg_maps and gl_info to vshader_add_footer().
parent
e9ff40d9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+8
-8
No files found.
dlls/wined3d/arb_program_shader.c
View file @
78652a5f
...
@@ -3097,13 +3097,11 @@ static void shader_hw_label(const struct wined3d_shader_instruction *ins)
...
@@ -3097,13 +3097,11 @@ static void shader_hw_label(const struct wined3d_shader_instruction *ins)
shader_addline
(
buffer
,
"l%u:
\n
"
,
ins
->
src
[
0
].
reg
.
idx
);
shader_addline
(
buffer
,
"l%u:
\n
"
,
ins
->
src
[
0
].
reg
.
idx
);
}
}
static
void
vshader_add_footer
(
IWineD3DVertexShaderImpl
*
This
,
struct
wined3d_shader_buffer
*
buffer
,
static
void
vshader_add_footer
(
struct
shader_arb_ctx_priv
*
priv_ctx
,
const
struct
arb_vs_compile_args
*
args
,
struct
shader_arb_ctx_priv
*
priv_ctx
)
const
struct
arb_vshader_private
*
shader_data
,
const
struct
arb_vs_compile_args
*
args
,
const
struct
shader_reg_maps
*
reg_maps
,
const
struct
wined3d_gl_info
*
gl_info
,
struct
wined3d_shader_buffer
*
buffer
)
{
{
const
struct
arb_vshader_private
*
shader_data
=
This
->
baseShader
.
backend_data
;
const
shader_reg_maps
*
reg_maps
=
&
This
->
baseShader
.
reg_maps
;
IWineD3DDeviceImpl
*
device
=
(
IWineD3DDeviceImpl
*
)
This
->
baseShader
.
device
;
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
unsigned
int
i
;
unsigned
int
i
;
/* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used
/* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used
...
@@ -3200,7 +3198,8 @@ static void shader_hw_ret(const struct wined3d_shader_instruction *ins)
...
@@ -3200,7 +3198,8 @@ static void shader_hw_ret(const struct wined3d_shader_instruction *ins)
if
(
vshader
)
if
(
vshader
)
{
{
if
(
priv
->
in_main_func
)
vshader_add_footer
((
IWineD3DVertexShaderImpl
*
)
shader
,
buffer
,
priv
->
cur_vs_args
,
priv
);
if
(
priv
->
in_main_func
)
vshader_add_footer
(
priv
,
shader
->
baseShader
.
backend_data
,
priv
->
cur_vs_args
,
ins
->
ctx
->
reg_maps
,
ins
->
ctx
->
gl_info
,
buffer
);
}
}
shader_addline
(
buffer
,
"RET;
\n
"
);
shader_addline
(
buffer
,
"RET;
\n
"
);
...
@@ -4183,7 +4182,8 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct
...
@@ -4183,7 +4182,8 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct
/* Base Shader Body */
/* Base Shader Body */
shader_generate_main
((
IWineD3DBaseShader
*
)
This
,
buffer
,
reg_maps
,
function
,
&
priv_ctx
);
shader_generate_main
((
IWineD3DBaseShader
*
)
This
,
buffer
,
reg_maps
,
function
,
&
priv_ctx
);
if
(
!
priv_ctx
.
footer_written
)
vshader_add_footer
(
This
,
buffer
,
args
,
&
priv_ctx
);
if
(
!
priv_ctx
.
footer_written
)
vshader_add_footer
(
&
priv_ctx
,
shader_data
,
args
,
reg_maps
,
gl_info
,
buffer
);
shader_addline
(
buffer
,
"END
\n
"
);
shader_addline
(
buffer
,
"END
\n
"
);
...
...
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