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
e5ef8057
Commit
e5ef8057
authored
Sep 29, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 29, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_state structure to find_arb_vs_compile_args().
parent
e12f5ff0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
8 deletions
+10
-8
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+10
-8
No files found.
dlls/wined3d/arb_program_shader.c
View file @
e5ef8057
...
...
@@ -4445,14 +4445,13 @@ static inline void find_arb_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWi
}
}
static
inline
void
find_arb_vs_compile_args
(
IWineD3DVertexShaderImpl
*
shader
,
IWineD3DStateBlockImpl
*
stateblock
,
struct
arb_vs_compile_args
*
args
)
static
void
find_arb_vs_compile_args
(
const
struct
wined3d_state
*
state
,
IWineD3DVertexShaderImpl
*
shader
,
struct
arb_vs_compile_args
*
args
)
{
int
i
;
WORD
int_skip
;
IWineD3DDeviceImpl
*
dev
=
(
IWineD3DDeviceImpl
*
)
shader
->
baseShader
.
device
;
const
struct
wined3d_gl_info
*
gl_info
=
&
dev
->
adapter
->
gl_info
;
const
struct
wined3d_state
*
state
=
&
stateblock
->
state
;
find_vs_compile_args
(
state
,
shader
,
&
args
->
super
);
...
...
@@ -4528,13 +4527,15 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS,
IWineD3DDeviceImpl
*
This
=
context
->
swapchain
->
device
;
struct
shader_arb_priv
*
priv
=
This
->
shader_priv
;
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
const
struct
wined3d_state
*
state
=
&
This
->
stateBlock
->
state
;
int
i
;
/* Deal with pixel shaders first so the vertex shader arg function has the input signature ready */
if
(
usePS
)
{
if
(
usePS
)
{
IWineD3DPixelShaderImpl
*
ps
=
state
->
pixel_shader
;
struct
arb_ps_compile_args
compile_args
;
struct
arb_ps_compiled_shader
*
compiled
;
IWineD3DPixelShaderImpl
*
ps
=
This
->
stateBlock
->
state
.
pixel_shader
;
TRACE
(
"Using pixel shader %p.
\n
"
,
ps
);
find_arb_ps_compile_args
(
ps
,
This
->
stateBlock
,
&
compile_args
);
...
...
@@ -4587,13 +4588,14 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS,
priv
->
current_fprogram_id
=
0
;
}
if
(
useVS
)
{
if
(
useVS
)
{
IWineD3DVertexShaderImpl
*
vs
=
state
->
vertex_shader
;
struct
arb_vs_compile_args
compile_args
;
struct
arb_vs_compiled_shader
*
compiled
;
IWineD3DVertexShaderImpl
*
vs
=
This
->
stateBlock
->
state
.
vertex_shader
;
TRACE
(
"Using vertex shader %p
\n
"
,
vs
);
find_arb_vs_compile_args
(
vs
,
This
->
stateBlock
,
&
compile_args
);
find_arb_vs_compile_args
(
state
,
vs
,
&
compile_args
);
compiled
=
find_arb_vshader
(
vs
,
&
compile_args
);
priv
->
current_vprogram_id
=
compiled
->
prgId
;
priv
->
compiled_vprog
=
compiled
;
...
...
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