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
3d718d64
Commit
3d718d64
authored
Aug 12, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 12, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Make the "labels" shader_reg_maps member a bitmap.
parent
270f57e7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
baseshader.c
dlls/wined3d/baseshader.c
+1
-1
glsl_shader.c
dlls/wined3d/glsl_shader.c
+3
-3
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/baseshader.c
View file @
3d718d64
...
...
@@ -599,7 +599,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3
struct
wined3d_shader_src_param
src
,
rel_addr
;
fe
->
shader_read_src_param
(
fe_data
,
&
pToken
,
&
src
,
&
rel_addr
);
reg_maps
->
labels
[
src
.
reg
.
idx
]
=
1
;
reg_maps
->
labels
|=
1
<<
src
.
reg
.
idx
;
}
/* Set texture, address, temporary registers */
else
...
...
dlls/wined3d/glsl_shader.c
View file @
3d718d64
...
...
@@ -821,9 +821,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
char
prefix
=
pshader
?
'P'
:
'V'
;
/* Prototype the subroutines */
for
(
i
=
0
;
i
<
This
->
baseShader
.
limits
.
label
;
i
++
)
{
if
(
reg_maps
->
labels
[
i
])
shader_addline
(
buffer
,
"void subroutine%u();
\n
"
,
i
);
for
(
i
=
0
,
map
=
reg_maps
->
labels
;
map
;
map
>>=
1
,
++
i
)
{
if
(
map
&
1
)
shader_addline
(
buffer
,
"void subroutine%u();
\n
"
,
i
);
}
/* Declare the constants (aka uniforms) */
...
...
dlls/wined3d/wined3d_private.h
View file @
3d718d64
...
...
@@ -630,8 +630,8 @@ typedef struct shader_reg_maps
struct
wined3d_shader_version
shader_version
;
BYTE
texcoord
;
/* MAX_REG_TEXCRD, 8 */
BYTE
address
;
/* MAX_REG_ADDR, 1 */
WORD
labels
;
/* MAX_LABELS, 16 */
DWORD
temporary
;
/* MAX_REG_TEMP, 32 */
char
labels
[
MAX_LABELS
];
/* pixel, vertex */
DWORD
*
constf
;
/* pixel, vertex */
DWORD
texcoord_mask
[
MAX_REG_TEXCRD
];
/* vertex < 3.0 */
WORD
input_registers
;
/* max(MAX_REG_INPUT, MAX_ATTRIBS), 16 */
...
...
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