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
2d1aeb43
Commit
2d1aeb43
authored
Dec 19, 2006
by
Stefan Dösinger
Committed by
Alexandre Julliard
Dec 20, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Add empty sampler entries to the state table.
parent
7f973c93
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletion
+22
-1
state.c
dlls/wined3d/state.c
+17
-0
wined3d_private.h
dlls/wined3d/wined3d_private.h
+5
-1
No files found.
dlls/wined3d/state.c
View file @
2d1aeb43
...
...
@@ -2127,4 +2127,21 @@ const struct StateEntry StateTable[] =
{
/*7, 30, undefined */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
{
/*7, 31, undefined */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
{
/*7, 32, WINED3DTSS_CONSTANT */
0
/* As long as we don't support D3DTA_CONSTANT */
,
state_nogl
},
/* Sampler states */
{
/* 0, Sampler 0 */
STATE_SAMPLER
(
0
),
state_undefined
},
{
/* 1, Sampler 1 */
STATE_SAMPLER
(
1
),
state_undefined
},
{
/* 2, Sampler 2 */
STATE_SAMPLER
(
2
),
state_undefined
},
{
/* 3, Sampler 3 */
STATE_SAMPLER
(
3
),
state_undefined
},
{
/* 4, Sampler 3 */
STATE_SAMPLER
(
4
),
state_undefined
},
{
/* 5, Sampler 5 */
STATE_SAMPLER
(
5
),
state_undefined
},
{
/* 6, Sampler 6 */
STATE_SAMPLER
(
6
),
state_undefined
},
{
/* 7, Sampler 7 */
STATE_SAMPLER
(
7
),
state_undefined
},
{
/* 8, Sampler 8 */
STATE_SAMPLER
(
8
),
state_undefined
},
{
/* 9, Sampler 9 */
STATE_SAMPLER
(
9
),
state_undefined
},
{
/*10, Sampler 10 */
STATE_SAMPLER
(
10
),
state_undefined
},
{
/*11, Sampler 11 */
STATE_SAMPLER
(
11
),
state_undefined
},
{
/*12, Sampler 12 */
STATE_SAMPLER
(
12
),
state_undefined
},
{
/*13, Sampler 13 */
STATE_SAMPLER
(
13
),
state_undefined
},
{
/*14, Sampler 14 */
STATE_SAMPLER
(
14
),
state_undefined
},
{
/*15, Sampler 15 */
STATE_SAMPLER
(
15
),
state_undefined
},
};
dlls/wined3d/wined3d_private.h
View file @
2d1aeb43
...
...
@@ -416,7 +416,11 @@ typedef void (*APPLYSTATEFUNC)(DWORD state, IWineD3DStateBlockImpl *stateblock);
#define STATE_TEXTURESTAGE(stage, num) (STATE_RENDER(WINEHIGHEST_RENDER_STATE) + (stage) * WINED3D_HIGHEST_TEXTURE_STATE + (num))
#define STATE_IS_TEXTURESTAGE(a) ((a) >= STATE_TEXTURESTAGE(0, 1) && (a) <= STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE))
#define STATE_HIGHEST (STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE))
/* + 1 because samplers start with 0 */
#define STATE_SAMPLER(num) (STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE) + 1 + (num))
#define STATE_IS_SAMPLER(num) ((num) >= STATE_SAMPLER(0) && (num) <= STATE_SAMPLER(MAX_SAMPLERS - 1))
#define STATE_HIGHEST (STATE_SAMPLER(MAX_SAMPLERS - 1))
struct
StateEntry
{
...
...
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