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
c94ecdff
Commit
c94ecdff
authored
May 17, 2006
by
Ivan Gyurdiev
Committed by
Alexandre Julliard
May 17, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Fix SINCOS parameters.
SINCOS has 4 parameters in shaders 2.0. It has 2 parameters in shaders 3.0. It's undefined in shaders 1.0.
parent
6b5d0763
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
pixelshader.c
dlls/wined3d/pixelshader.c
+7
-2
vertexshader.c
dlls/wined3d/vertexshader.c
+7
-2
No files found.
dlls/wined3d/pixelshader.c
View file @
c94ecdff
...
@@ -533,10 +533,14 @@ void pshader_nrm(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) {
...
@@ -533,10 +533,14 @@ void pshader_nrm(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) {
FIXME
(
" : Stub
\n
"
);
FIXME
(
" : Stub
\n
"
);
}
}
void
pshader_sincos
(
WINED3DSHADERVECTOR
*
d
,
WINED3DSHADERVECTOR
*
s0
)
{
void
pshader_sincos
3
(
WINED3DSHADERVECTOR
*
d
,
WINED3DSHADERVECTOR
*
s0
)
{
FIXME
(
" : Stub
\n
"
);
FIXME
(
" : Stub
\n
"
);
}
}
void
pshader_sincos2
(
WINED3DSHADERVECTOR
*
d
,
WINED3DSHADERVECTOR
*
s0
,
WINED3DSHADERVECTOR
*
s1
,
WINED3DSHADERVECTOR
*
s2
)
{
FIXME
(
" : Stub
\n
"
);
}
void
pshader_rep
(
WINED3DSHADERVECTOR
*
d
)
{
void
pshader_rep
(
WINED3DSHADERVECTOR
*
d
)
{
FIXME
(
" : Stub
\n
"
);
FIXME
(
" : Stub
\n
"
);
}
}
...
@@ -667,7 +671,8 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = {
...
@@ -667,7 +671,8 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = {
*/
*/
{
D3DSIO_NRM
,
"nrm"
,
NULL
,
2
,
pshader_nrm
,
NULL
,
NULL
,
0
,
0
},
{
D3DSIO_NRM
,
"nrm"
,
NULL
,
2
,
pshader_nrm
,
NULL
,
NULL
,
0
,
0
},
{
D3DSIO_SINCOS
,
"sincos"
,
NULL
,
2
,
pshader_sincos
,
NULL
,
NULL
,
0
,
0
},
{
D3DSIO_SINCOS
,
"sincos"
,
NULL
,
4
,
pshader_sincos2
,
NULL
,
NULL
,
D3DPS_VERSION
(
2
,
0
),
D3DPS_VERSION
(
2
,
0
)},
{
D3DSIO_SINCOS
,
"sincos"
,
NULL
,
2
,
pshader_sincos3
,
NULL
,
NULL
,
D3DPS_VERSION
(
3
,
0
),
-
1
},
/* TODO: dp2add can be made out of multiple instuctions */
/* TODO: dp2add can be made out of multiple instuctions */
{
D3DSIO_DP2ADD
,
"dp2add"
,
GLNAME_REQUIRE_GLSL
,
2
,
pshader_dp2add
,
NULL
,
NULL
,
0
,
0
},
{
D3DSIO_DP2ADD
,
"dp2add"
,
GLNAME_REQUIRE_GLSL
,
2
,
pshader_dp2add
,
NULL
,
NULL
,
0
,
0
},
...
...
dlls/wined3d/vertexshader.c
View file @
c94ecdff
...
@@ -404,10 +404,14 @@ void vshader_nrm(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) {
...
@@ -404,10 +404,14 @@ void vshader_nrm(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) {
FIXME
(
" : Stub
\n
"
);
FIXME
(
" : Stub
\n
"
);
}
}
void
vshader_sincos
(
WINED3DSHADERVECTOR
*
d
,
WINED3DSHADERVECTOR
*
s0
)
{
void
vshader_sincos
3
(
WINED3DSHADERVECTOR
*
d
,
WINED3DSHADERVECTOR
*
s0
)
{
FIXME
(
" : Stub
\n
"
);
FIXME
(
" : Stub
\n
"
);
}
}
void
vshader_sincos2
(
WINED3DSHADERVECTOR
*
d
,
WINED3DSHADERVECTOR
*
s0
,
WINED3DSHADERVECTOR
*
s1
,
WINED3DSHADERVECTOR
*
s2
)
{
FIXME
(
" : Stub
\n
"
);
}
void
vshader_rep
(
WINED3DSHADERVECTOR
*
d
)
{
void
vshader_rep
(
WINED3DSHADERVECTOR
*
d
)
{
FIXME
(
" : Stub
\n
"
);
FIXME
(
" : Stub
\n
"
);
}
}
...
@@ -524,7 +528,8 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = {
...
@@ -524,7 +528,8 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = {
*/
*/
{
D3DSIO_NRM
,
"nrm"
,
NULL
,
2
,
vshader_nrm
,
NULL
,
NULL
,
0
,
0
},
{
D3DSIO_NRM
,
"nrm"
,
NULL
,
2
,
vshader_nrm
,
NULL
,
NULL
,
0
,
0
},
{
D3DSIO_SINCOS
,
"sincos"
,
NULL
,
2
,
vshader_sincos
,
NULL
,
NULL
,
0
,
0
},
{
D3DSIO_SINCOS
,
"sincos"
,
NULL
,
4
,
vshader_sincos2
,
NULL
,
NULL
,
D3DVS_VERSION
(
2
,
0
),
D3DVS_VERSION
(
2
,
0
)},
{
D3DSIO_SINCOS
,
"sincos"
,
NULL
,
2
,
vshader_sincos3
,
NULL
,
NULL
,
D3DVS_VERSION
(
3
,
0
),
-
1
},
/* Matrix */
/* Matrix */
{
D3DSIO_M4x4
,
"m4x4"
,
"undefined"
,
3
,
vshader_m4x4
,
vshader_hw_mnxn
,
NULL
,
0
,
0
},
{
D3DSIO_M4x4
,
"m4x4"
,
"undefined"
,
3
,
vshader_m4x4
,
vshader_hw_mnxn
,
NULL
,
0
,
0
},
...
...
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