Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
e8137632
Commit
e8137632
authored
Oct 09, 2006
by
Ivan Gyurdiev
Committed by
Alexandre Julliard
Oct 10, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Move D3DSP DCL-related structures into WINED3D namespace.
parent
7259b9d8
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
24 deletions
+31
-24
baseshader.c
dlls/wined3d/baseshader.c
+2
-2
glsl_shader.c
dlls/wined3d/glsl_shader.c
+4
-4
vertexshader.c
dlls/wined3d/vertexshader.c
+5
-5
wined3d_private_types.h
dlls/wined3d/wined3d_private_types.h
+20
-0
wined3d_types.h
include/wine/wined3d_types.h
+0
-13
No files found.
dlls/wined3d/baseshader.c
View file @
e8137632
...
...
@@ -409,8 +409,8 @@ static void shader_dump_decl_usage(
}
else
{
DWORD
usage
=
decl
&
D3DSP_DCL_USAGE_MASK
;
DWORD
idx
=
(
decl
&
D3DSP_DCL_USAGEINDEX_MASK
)
>>
D3DSP_DCL_USAGEINDEX_SHIFT
;
DWORD
usage
=
decl
&
WINE
D3DSP_DCL_USAGE_MASK
;
DWORD
idx
=
(
decl
&
WINED3DSP_DCL_USAGEINDEX_MASK
)
>>
WINE
D3DSP_DCL_USAGEINDEX_SHIFT
;
/* Pixel shaders 3.0 don't have usage semantics */
char
pshader
=
shader_is_pshader_version
(
This
->
baseShader
.
hex_version
);
...
...
dlls/wined3d/glsl_shader.c
View file @
e8137632
...
...
@@ -1809,8 +1809,8 @@ void pshader_glsl_input_pack(
/* Uninitialized */
if
(
!
usage_token
)
continue
;
usage
=
(
usage_token
&
D3DSP_DCL_USAGE_MASK
)
>>
D3DSP_DCL_USAGE_SHIFT
;
usage_idx
=
(
usage_token
&
D3DSP_DCL_USAGEINDEX_MASK
)
>>
D3DSP_DCL_USAGEINDEX_SHIFT
;
usage
=
(
usage_token
&
WINED3DSP_DCL_USAGE_MASK
)
>>
WINE
D3DSP_DCL_USAGE_SHIFT
;
usage_idx
=
(
usage_token
&
WINED3DSP_DCL_USAGEINDEX_MASK
)
>>
WINE
D3DSP_DCL_USAGEINDEX_SHIFT
;
shader_glsl_get_output_register_swizzle
(
register_token
,
reg_mask
);
switch
(
usage
)
{
...
...
@@ -1864,8 +1864,8 @@ void vshader_glsl_output_unpack(
/* Uninitialized */
if
(
!
usage_token
)
continue
;
usage
=
(
usage_token
&
D3DSP_DCL_USAGE_MASK
)
>>
D3DSP_DCL_USAGE_SHIFT
;
usage_idx
=
(
usage_token
&
D3DSP_DCL_USAGEINDEX_MASK
)
>>
D3DSP_DCL_USAGEINDEX_SHIFT
;
usage
=
(
usage_token
&
WINED3DSP_DCL_USAGE_MASK
)
>>
WINE
D3DSP_DCL_USAGE_SHIFT
;
usage_idx
=
(
usage_token
&
WINED3DSP_DCL_USAGEINDEX_MASK
)
>>
WINE
D3DSP_DCL_USAGEINDEX_SHIFT
;
shader_glsl_get_output_register_swizzle
(
register_token
,
reg_mask
);
switch
(
usage
)
{
...
...
dlls/wined3d/vertexshader.c
View file @
e8137632
...
...
@@ -623,7 +623,7 @@ static void vshader_set_input(
/* Fake usage: set reserved bit, usage, usage_idx */
DWORD
usage_token
=
(
0x1
<<
31
)
|
(
usage
<<
D3DSP_DCL_USAGE_SHIFT
)
|
(
usage_idx
<<
D3DSP_DCL_USAGEINDEX_SHIFT
);
(
usage
<<
WINED3DSP_DCL_USAGE_SHIFT
)
|
(
usage_idx
<<
WINE
D3DSP_DCL_USAGEINDEX_SHIFT
);
/* Fake register; set reserved bit, regnum, type: input, wmask: all */
DWORD
reg_token
=
(
0x1
<<
31
)
|
...
...
@@ -643,8 +643,8 @@ BOOL vshader_get_input(
for
(
i
=
0
;
i
<
MAX_ATTRIBS
;
i
++
)
{
DWORD
usage_token
=
This
->
semantics_in
[
i
].
usage
;
DWORD
usage
=
(
usage_token
&
D3DSP_DCL_USAGE_MASK
)
>>
D3DSP_DCL_USAGE_SHIFT
;
DWORD
usage_idx
=
(
usage_token
&
D3DSP_DCL_USAGEINDEX_MASK
)
>>
D3DSP_DCL_USAGEINDEX_SHIFT
;
DWORD
usage
=
(
usage_token
&
WINED3DSP_DCL_USAGE_MASK
)
>>
WINE
D3DSP_DCL_USAGE_SHIFT
;
DWORD
usage_idx
=
(
usage_token
&
WINED3DSP_DCL_USAGEINDEX_MASK
)
>>
WINE
D3DSP_DCL_USAGEINDEX_SHIFT
;
if
(
usage_token
&&
(
usage
==
usage_req
&&
usage_idx
==
usage_idx_req
))
{
*
regnum
=
i
;
...
...
@@ -662,8 +662,8 @@ BOOL vshader_input_is_color(
IWineD3DDeviceImpl
*
deviceImpl
=
(
IWineD3DDeviceImpl
*
)
This
->
baseShader
.
device
;
DWORD
usage_token
=
This
->
semantics_in
[
regnum
].
usage
;
DWORD
usage
=
(
usage_token
&
D3DSP_DCL_USAGE_MASK
)
>>
D3DSP_DCL_USAGE_SHIFT
;
DWORD
usage_idx
=
(
usage_token
&
D3DSP_DCL_USAGEINDEX_MASK
)
>>
D3DSP_DCL_USAGEINDEX_SHIFT
;
DWORD
usage
=
(
usage_token
&
WINED3DSP_DCL_USAGE_MASK
)
>>
WINE
D3DSP_DCL_USAGE_SHIFT
;
DWORD
usage_idx
=
(
usage_token
&
WINED3DSP_DCL_USAGEINDEX_MASK
)
>>
WINE
D3DSP_DCL_USAGEINDEX_SHIFT
;
IWineD3DVertexDeclarationImpl
*
vertexDeclaration
=
NULL
;
if
(
This
->
vertexDeclaration
)
{
...
...
dlls/wined3d/wined3d_private_types.h
View file @
e8137632
...
...
@@ -23,6 +23,26 @@
#ifndef __WINE_WINED3D_TYPES_INTERNAL_H
#define __WINE_WINED3D_TYPES_INTERNAL_H
/** DCL usage masks **/
#define WINED3DSP_DCL_USAGE_SHIFT 0
#define WINED3DSP_DCL_USAGE_MASK 0x0000000f
#define WINED3DSP_DCL_USAGEINDEX_SHIFT 16
#define WINED3DSP_DCL_USAGEINDEX_MASK 0x000f0000
/** DCL sampler texture type **/
#define WINED3DSP_TEXTURETYPE_SHIFT 27
#define WINED3DSP_TEXTURETYPE_MASK 0x78000000
typedef
enum
_WINED3DSAMPLER_TEXTURE_TYPE
{
WINED3DSTT_UNKNOWN
=
0
<<
WINED3DSP_TEXTURETYPE_SHIFT
,
WINED3DSTT_1D
=
1
<<
WINED3DSP_TEXTURETYPE_SHIFT
,
WINED3DSTT_2D
=
2
<<
WINED3DSP_TEXTURETYPE_SHIFT
,
WINED3DSTT_CUBE
=
3
<<
WINED3DSP_TEXTURETYPE_SHIFT
,
WINED3DSTT_VOLUME
=
4
<<
WINED3DSP_TEXTURETYPE_SHIFT
,
WINED3DSTT_FORCE_DWORD
=
0x7FFFFFFF
}
WINED3DSAMPLER_TEXTURE_TYPE
;
/** register types for PS and VS */
typedef
enum
_WINED3DSHADER_PARAM_REGISTER_TYPE
{
WINED3DSPR_TEMP
=
0
,
...
...
include/wine/wined3d_types.h
View file @
e8137632
...
...
@@ -1028,19 +1028,6 @@ typedef enum _WINED3DDECLUSAGE {
WINED3DSHADERDECLUSAGE_MAX_USAGE
}
WINED3DSHADERDECLUSAGE
;
#define WINED3DSP_TEXTURETYPE_SHIFT 27
#define WINED3DSP_TEXTURETYPE_MASK 0x78000000
typedef
enum
_WINED3DSAMPLER_TEXTURE_TYPE
{
WINED3DSTT_UNKNOWN
=
0
<<
WINED3DSP_TEXTURETYPE_SHIFT
,
WINED3DSTT_1D
=
1
<<
WINED3DSP_TEXTURETYPE_SHIFT
,
WINED3DSTT_2D
=
2
<<
WINED3DSP_TEXTURETYPE_SHIFT
,
WINED3DSTT_CUBE
=
3
<<
WINED3DSP_TEXTURETYPE_SHIFT
,
WINED3DSTT_VOLUME
=
4
<<
WINED3DSP_TEXTURETYPE_SHIFT
,
WINED3DSTT_FORCE_DWORD
=
0x7FFFFFFF
}
WINED3DSAMPLER_TEXTURE_TYPE
;
#define WINED3DUSAGE_RENDERTARGET 0x00000001L
#define WINED3DUSAGE_DEPTHSTENCIL 0x00000002L
#define WINED3DUSAGE_WRITEONLY 0x00000008L
...
...
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