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
26e1293d
Commit
26e1293d
authored
Nov 30, 2022
by
Nikolay Sivov
Committed by
Alexandre Julliard
Dec 01, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9/preshader: Handle input register table.
parent
7cc7a6de
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
d3dx9_private.h
dlls/d3dx9_36/d3dx9_private.h
+1
-0
preshader.c
dlls/d3dx9_36/preshader.c
+11
-5
No files found.
dlls/d3dx9_36/d3dx9_private.h
View file @
26e1293d
...
...
@@ -241,6 +241,7 @@ enum pres_reg_tables
{
PRES_REGTAB_IMMED
,
PRES_REGTAB_CONST
,
PRES_REGTAB_INPUT
,
PRES_REGTAB_OCONST
,
PRES_REGTAB_OBCONST
,
PRES_REGTAB_OICONST
,
...
...
dlls/d3dx9_36/preshader.c
View file @
26e1293d
...
...
@@ -202,6 +202,7 @@ table_info[] =
{
{
sizeof
(
double
),
PRES_VT_DOUBLE
},
/* PRES_REGTAB_IMMED */
{
sizeof
(
float
),
PRES_VT_FLOAT
},
/* PRES_REGTAB_CONST */
{
sizeof
(
float
),
PRES_VT_FLOAT
},
/* PRES_REGTAB_INPUT */
{
sizeof
(
float
),
PRES_VT_FLOAT
},
/* PRES_REGTAB_OCONST */
{
sizeof
(
BOOL
),
PRES_VT_BOOL
},
/* PRES_REGTAB_OBCONST */
{
sizeof
(
int
),
PRES_VT_INT
,
},
/* PRES_REGTAB_OICONST */
...
...
@@ -211,7 +212,7 @@ table_info[] =
static
const
char
*
table_symbol
[]
=
{
"imm"
,
"c"
,
"oc"
,
"ob"
,
"oi"
,
"r"
,
"(null)"
,
"imm"
,
"c"
,
"
v"
,
"
oc"
,
"ob"
,
"oi"
,
"r"
,
"(null)"
,
};
static
const
enum
pres_reg_tables
pres_regset2table
[]
=
...
...
@@ -414,7 +415,7 @@ static unsigned int *parse_pres_reg(unsigned int *ptr, struct d3dx_pres_reg *reg
{
static
const
enum
pres_reg_tables
reg_table
[
8
]
=
{
PRES_REGTAB_COUNT
,
PRES_REGTAB_IMMED
,
PRES_REGTAB_CONST
,
PRES_REGTAB_
COUN
T
,
PRES_REGTAB_COUNT
,
PRES_REGTAB_IMMED
,
PRES_REGTAB_CONST
,
PRES_REGTAB_
INPU
T
,
PRES_REGTAB_OCONST
,
PRES_REGTAB_OBCONST
,
PRES_REGTAB_OICONST
,
PRES_REGTAB_TEMP
};
...
...
@@ -1019,7 +1020,7 @@ static void update_table_sizes_consts(unsigned int *table_sizes, struct d3dx_con
static
void
dump_arg
(
struct
d3dx_regstore
*
rs
,
const
struct
d3dx_pres_operand
*
arg
,
int
component_count
)
{
static
const
char
*
xyzw_str
=
"xyzw"
;
unsigned
int
i
,
table
;
unsigned
int
i
,
table
,
reg_offset
;
table
=
arg
->
reg
.
table
;
if
(
table
==
PRES_REGTAB_IMMED
&&
arg
->
index_reg
.
table
==
PRES_REGTAB_COUNT
)
...
...
@@ -1032,16 +1033,21 @@ static void dump_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *a
}
else
{
reg_offset
=
get_reg_offset
(
table
,
arg
->
reg
.
offset
);
if
(
arg
->
index_reg
.
table
==
PRES_REGTAB_COUNT
)
{
TRACE
(
"%s%u."
,
table_symbol
[
table
],
get_reg_offset
(
table
,
arg
->
reg
.
offset
));
if
(
table
==
PRES_REGTAB_INPUT
&&
reg_offset
<
2
)
TRACE
(
"%s%s."
,
table_symbol
[
table
],
reg_offset
?
"PSize"
:
"Pos"
);
else
TRACE
(
"%s%u."
,
table_symbol
[
table
],
reg_offset
);
}
else
{
unsigned
int
index_reg
;
index_reg
=
get_reg_offset
(
arg
->
index_reg
.
table
,
arg
->
index_reg
.
offset
);
TRACE
(
"%s[%u + %s%u.%c]."
,
table_symbol
[
table
],
get_reg_offset
(
table
,
arg
->
reg
.
offset
)
,
TRACE
(
"%s[%u + %s%u.%c]."
,
table_symbol
[
table
],
reg_offset
,
table_symbol
[
arg
->
index_reg
.
table
],
index_reg
,
xyzw_str
[
arg
->
index_reg
.
offset
-
get_offset_reg
(
arg
->
index_reg
.
table
,
index_reg
)]);
}
...
...
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