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
0405733f
Commit
0405733f
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 and reg_maps to reserved_vs_const().
parent
a5641016
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+6
-6
No files found.
dlls/wined3d/arb_program_shader.c
View file @
0405733f
...
...
@@ -344,15 +344,14 @@ static BOOL need_helper_const(const struct arb_vshader_private *shader_data,
return
FALSE
;
}
static
unsigned
int
reserved_vs_const
(
IWineD3DVertexShaderImpl
*
shader
,
const
struct
wined3d_gl_info
*
gl_info
)
static
unsigned
int
reserved_vs_const
(
const
struct
arb_vshader_private
*
shader_data
,
const
struct
shader_reg_maps
*
reg_maps
,
const
struct
wined3d_gl_info
*
gl_info
)
{
unsigned
int
ret
=
1
;
/* We use one PARAM for the pos fixup, and in some cases one to load
* some immediate values into the shader. */
if
(
need_helper_const
(
shader
->
baseShader
.
backend_data
,
&
shader
->
baseShader
.
reg_maps
,
gl_info
))
++
ret
;
if
(
need_rel_addr_const
(
shader
->
baseShader
.
backend_data
,
&
shader
->
baseShader
.
reg_maps
,
gl_info
))
++
ret
;
if
(
need_helper_const
(
shader_data
,
reg_maps
,
gl_info
))
++
ret
;
if
(
need_rel_addr_const
(
shader_data
,
reg_maps
,
gl_info
))
++
ret
;
return
ret
;
}
...
...
@@ -725,6 +724,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s
}
else
{
const
struct
arb_vshader_private
*
shader_data
=
This
->
baseShader
.
backend_data
;
max_constantsF
=
gl_info
->
limits
.
arb_vs_native_constants
;
/* 96 is the minimum MAX_PROGRAM_ENV_PARAMETERS_ARB value.
* Also prevents max_constantsF from becoming less than 0 and
...
...
@@ -735,7 +735,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s
if
(
This
->
baseShader
.
reg_maps
.
usesrelconstF
)
{
DWORD
highest_constf
=
0
,
clip_limit
;
max_constantsF
-=
reserved_vs_const
(
(
IWineD3DVertexShaderImpl
*
)
Thi
s
,
gl_info
);
max_constantsF
-=
reserved_vs_const
(
shader_data
,
reg_map
s
,
gl_info
);
max_constantsF
-=
count_bits
(
This
->
baseShader
.
reg_maps
.
integer_constants
);
for
(
i
=
0
;
i
<
This
->
baseShader
.
limits
.
constant_float
;
i
++
)
...
...
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