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
822030e3
Commit
822030e3
authored
Sep 05, 2007
by
Stefan Dösinger
Committed by
Alexandre Julliard
Oct 01, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Enable the mNxN implementation for pixel shaders.
parent
d4019780
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
13 deletions
+13
-13
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+2
-2
pixelshader.c
dlls/wined3d/pixelshader.c
+5
-5
vertexshader.c
dlls/wined3d/vertexshader.c
+5
-5
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/arb_program_shader.c
View file @
822030e3
...
...
@@ -1449,8 +1449,8 @@ void pshader_hw_texm3x2depth(SHADER_OPCODE_ARG* arg) {
}
/** Handles transforming all WINED3DSIO_M?x? opcodes for
Vertex shaders to ARB_vertex_program codes */
void
v
shader_hw_mnxn
(
SHADER_OPCODE_ARG
*
arg
)
{
Vertex
/Pixel
shaders to ARB_vertex_program codes */
void
shader_hw_mnxn
(
SHADER_OPCODE_ARG
*
arg
)
{
int
i
;
int
nComponents
=
0
;
...
...
dlls/wined3d/pixelshader.c
View file @
822030e3
...
...
@@ -182,11 +182,11 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = {
{
WINED3DSIO_SINCOS
,
"sincos"
,
"SCS"
,
1
,
2
,
shader_hw_sincos
,
shader_glsl_sincos
,
WINED3DPS_VERSION
(
3
,
0
),
-
1
},
{
WINED3DSIO_DP2ADD
,
"dp2add"
,
NULL
,
1
,
4
,
pshader_hw_dp2add
,
pshader_glsl_dp2add
,
WINED3DPS_VERSION
(
2
,
0
),
-
1
},
/* Matrix */
{
WINED3DSIO_M4x4
,
"m4x4"
,
"undefined"
,
1
,
3
,
NULL
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M4x3
,
"m4x3"
,
"undefined"
,
1
,
3
,
NULL
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M3x4
,
"m3x4"
,
"undefined"
,
1
,
3
,
NULL
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M3x3
,
"m3x3"
,
"undefined"
,
1
,
3
,
NULL
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M3x2
,
"m3x2"
,
"undefined"
,
1
,
3
,
NULL
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M4x4
,
"m4x4"
,
"undefined"
,
1
,
3
,
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M4x3
,
"m4x3"
,
"undefined"
,
1
,
3
,
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M3x4
,
"m3x4"
,
"undefined"
,
1
,
3
,
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M3x3
,
"m3x3"
,
"undefined"
,
1
,
3
,
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M3x2
,
"m3x2"
,
"undefined"
,
1
,
3
,
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
/* Register declarations */
{
WINED3DSIO_DCL
,
"dcl"
,
NULL
,
0
,
2
,
NULL
,
NULL
,
0
,
0
},
/* Flow control - requires GLSL or software shaders */
...
...
dlls/wined3d/vertexshader.c
View file @
822030e3
...
...
@@ -118,11 +118,11 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = {
{
WINED3DSIO_SINCOS
,
"sincos"
,
NULL
,
1
,
4
,
shader_hw_sincos
,
shader_glsl_sincos
,
WINED3DVS_VERSION
(
2
,
0
),
WINED3DVS_VERSION
(
2
,
1
)},
{
WINED3DSIO_SINCOS
,
"sincos"
,
"SCS"
,
1
,
2
,
shader_hw_sincos
,
shader_glsl_sincos
,
WINED3DVS_VERSION
(
3
,
0
),
-
1
},
/* Matrix */
{
WINED3DSIO_M4x4
,
"m4x4"
,
"undefined"
,
1
,
3
,
v
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M4x3
,
"m4x3"
,
"undefined"
,
1
,
3
,
v
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M3x4
,
"m3x4"
,
"undefined"
,
1
,
3
,
v
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M3x3
,
"m3x3"
,
"undefined"
,
1
,
3
,
v
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M3x2
,
"m3x2"
,
"undefined"
,
1
,
3
,
v
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M4x4
,
"m4x4"
,
"undefined"
,
1
,
3
,
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M4x3
,
"m4x3"
,
"undefined"
,
1
,
3
,
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M3x4
,
"m3x4"
,
"undefined"
,
1
,
3
,
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M3x3
,
"m3x3"
,
"undefined"
,
1
,
3
,
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
{
WINED3DSIO_M3x2
,
"m3x2"
,
"undefined"
,
1
,
3
,
shader_hw_mnxn
,
shader_glsl_mnxn
,
0
,
0
},
/* Declare registers */
{
WINED3DSIO_DCL
,
"dcl"
,
NULL
,
0
,
2
,
NULL
,
NULL
,
0
,
0
},
/* Constant definitions */
...
...
dlls/wined3d/wined3d_private.h
View file @
822030e3
...
...
@@ -1793,10 +1793,10 @@ extern void pshader_hw_texreg2rgb(SHADER_OPCODE_ARG* arg);
/* ARB vertex / pixel shader common prototypes */
extern
void
shader_hw_nrm
(
SHADER_OPCODE_ARG
*
arg
);
extern
void
shader_hw_sincos
(
SHADER_OPCODE_ARG
*
arg
);
extern
void
shader_hw_mnxn
(
SHADER_OPCODE_ARG
*
arg
);
/* ARB vertex shader prototypes */
extern
void
vshader_hw_map2gl
(
SHADER_OPCODE_ARG
*
arg
);
extern
void
vshader_hw_mnxn
(
SHADER_OPCODE_ARG
*
arg
);
extern
void
vshader_hw_rsq_rcp
(
SHADER_OPCODE_ARG
*
arg
);
/* GLSL helper functions */
...
...
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