Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
9da92403
Commit
9da92403
authored
13 years ago
by
Matteo Bruni
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wined3d: Split pow instruction handling in the ARB backend.
parent
db8d681a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/wined3d/arb_program_shader.c
+31
-20
31 additions, 20 deletions
dlls/wined3d/arb_program_shader.c
with
31 additions
and
20 deletions
dlls/wined3d/arb_program_shader.c
+
31
−
20
View file @
9da92403
...
...
@@ -2733,51 +2733,62 @@ static DWORD abs_modifier(DWORD mod, BOOL *need_abs)
return
mod
;
}
static
void
shader_hw_log
_pow
(
const
struct
wined3d_shader_instruction
*
ins
)
static
void
shader_hw_log
(
const
struct
wined3d_shader_instruction
*
ins
)
{
struct
wined3d_shader_buffer
*
buffer
=
ins
->
ctx
->
buffer
;
char
src0
[
50
],
src1
[
50
],
dst
[
50
];
char
src0
[
50
],
dst
[
50
];
struct
wined3d_shader_src_param
src0_copy
=
ins
->
src
[
0
];
BOOL
need_abs
=
FALSE
;
const
char
*
instr
;
BOOL
arg2
=
FALSE
;
switch
(
ins
->
handler_idx
)
{
case
WINED3DSIH_LOG
:
instr
=
"LG2"
;
break
;
case
WINED3DSIH_LOGP
:
instr
=
"LOG"
;
break
;
case
WINED3DSIH_POW
:
instr
=
"POW"
;
arg2
=
TRUE
;
break
;
default:
ERR
(
"Unexpected instruction %d
\n
"
,
ins
->
handler_idx
);
return
;
}
/* LOG
, LOGP
and
POW
operate on the absolute value of the input */
/* LOG and
LOGP
operate on the absolute value of the input */
src0_copy
.
modifiers
=
abs_modifier
(
src0_copy
.
modifiers
,
&
need_abs
);
shader_arb_get_dst_param
(
ins
,
&
ins
->
dst
[
0
],
dst
);
shader_arb_get_src_param
(
ins
,
&
src0_copy
,
0
,
src0
);
if
(
arg2
)
shader_arb_get_src_param
(
ins
,
&
ins
->
src
[
1
],
1
,
src1
);
if
(
need_abs
)
{
shader_addline
(
buffer
,
"ABS TA, %s;
\n
"
,
src0
);
if
(
arg2
)
{
shader_addline
(
buffer
,
"%s%s %s, TA, %s;
\n
"
,
instr
,
shader_arb_get_modifier
(
ins
),
dst
,
src1
);
}
else
{
shader_addline
(
buffer
,
"%s%s %s, TA;
\n
"
,
instr
,
shader_arb_get_modifier
(
ins
),
dst
);
}
shader_addline
(
buffer
,
"%s%s %s, TA;
\n
"
,
instr
,
shader_arb_get_modifier
(
ins
),
dst
);
}
else
if
(
arg2
)
else
{
shader_addline
(
buffer
,
"%s%s %s, %s;
\n
"
,
instr
,
shader_arb_get_modifier
(
ins
),
dst
,
src0
);
}
}
static
void
shader_hw_pow
(
const
struct
wined3d_shader_instruction
*
ins
)
{
struct
wined3d_shader_buffer
*
buffer
=
ins
->
ctx
->
buffer
;
char
src0
[
50
],
src1
[
50
],
dst
[
50
];
struct
wined3d_shader_src_param
src0_copy
=
ins
->
src
[
0
];
BOOL
need_abs
=
FALSE
;
/* POW operates on the absolute value of the input */
src0_copy
.
modifiers
=
abs_modifier
(
src0_copy
.
modifiers
,
&
need_abs
);
shader_arb_get_dst_param
(
ins
,
&
ins
->
dst
[
0
],
dst
);
shader_arb_get_src_param
(
ins
,
&
src0_copy
,
0
,
src0
);
shader_arb_get_src_param
(
ins
,
&
ins
->
src
[
1
],
1
,
src1
);
if
(
need_abs
)
{
shader_addline
(
buffer
,
"%s%s %s, %s, %s;
\n
"
,
instr
,
shader_arb_get_modifier
(
ins
),
dst
,
src0
,
src1
);
shader_addline
(
buffer
,
"ABS TA.x, %s;
\n
"
,
src0
);
shader_addline
(
buffer
,
"POW%s %s, TA.x, %s;
\n
"
,
shader_arb_get_modifier
(
ins
),
dst
,
src1
);
}
else
{
shader_addline
(
buffer
,
"%s%s %s, %s;
\n
"
,
instr
,
shader_arb_get_modifier
(
ins
),
dst
,
src0
);
shader_addline
(
buffer
,
"
POW
%s
%s
,
%s, %s;
\n
"
,
shader_arb_get_modifier
(
ins
),
dst
,
src0
,
src1
);
}
}
...
...
@@ -5007,8 +5018,8 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_LABEL */
shader_hw_label
,
/* WINED3DSIH_LD */
NULL
,
/* WINED3DSIH_LIT */
shader_hw_map2gl
,
/* WINED3DSIH_LOG */
shader_hw_log
_pow
,
/* WINED3DSIH_LOGP */
shader_hw_log
_pow
,
/* WINED3DSIH_LOG */
shader_hw_log
,
/* WINED3DSIH_LOGP */
shader_hw_log
,
/* WINED3DSIH_LOOP */
shader_hw_loop
,
/* WINED3DSIH_LRP */
shader_hw_lrp
,
/* WINED3DSIH_LT */
NULL
,
...
...
@@ -5027,7 +5038,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_NOP */
shader_hw_nop
,
/* WINED3DSIH_NRM */
shader_hw_nrm
,
/* WINED3DSIH_PHASE */
NULL
,
/* WINED3DSIH_POW */
shader_hw_
log_
pow
,
/* WINED3DSIH_POW */
shader_hw_pow
,
/* WINED3DSIH_RCP */
shader_hw_rcp
,
/* WINED3DSIH_REP */
shader_hw_rep
,
/* WINED3DSIH_RET */
shader_hw_ret
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment