wined3d: Merge wined3d_private_types.h into wined3d_private.h.
Henri Verbeet
hverbeet at codeweavers.com
Fri May 1 02:13:54 CDT 2009
---
dlls/wined3d/wined3d_private.h | 212 ++++++++++++++++++++++++++++++--
dlls/wined3d/wined3d_private_types.h | 228 ----------------------------------
2 files changed, 201 insertions(+), 239 deletions(-)
delete mode 100644 dlls/wined3d/wined3d_private_types.h
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 16512cc..faecf2e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3,7 +3,7 @@
*
* Copyright 2002-2003 The wine-d3d team
* Copyright 2002-2003 Raphael Junqueira
- * Copyright 2004 Jason Edmeades
+ * Copyright 2002-2003, 2004 Jason Edmeades
* Copyright 2005 Oliver Stieber
*
* This library is free software; you can redistribute it and/or
@@ -38,7 +38,6 @@
#include "wine/unicode.h"
#include "objbase.h"
-#include "wined3d_private_types.h"
#include "wine/wined3d.h"
#include "wined3d_gl.h"
#include "wine/list.h"
@@ -290,6 +289,195 @@ typedef struct wined3d_settings_s {
extern wined3d_settings_t wined3d_settings;
+typedef enum _WINED3DSAMPLER_TEXTURE_TYPE
+{
+ WINED3DSTT_UNKNOWN = 0,
+ WINED3DSTT_1D = 1,
+ WINED3DSTT_2D = 2,
+ WINED3DSTT_CUBE = 3,
+ WINED3DSTT_VOLUME = 4,
+} WINED3DSAMPLER_TEXTURE_TYPE;
+
+typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE
+{
+ WINED3DSPR_TEMP = 0,
+ WINED3DSPR_INPUT = 1,
+ WINED3DSPR_CONST = 2,
+ WINED3DSPR_ADDR = 3,
+ WINED3DSPR_TEXTURE = 3,
+ WINED3DSPR_RASTOUT = 4,
+ WINED3DSPR_ATTROUT = 5,
+ WINED3DSPR_TEXCRDOUT = 6,
+ WINED3DSPR_OUTPUT = 6,
+ WINED3DSPR_CONSTINT = 7,
+ WINED3DSPR_COLOROUT = 8,
+ WINED3DSPR_DEPTHOUT = 9,
+ WINED3DSPR_SAMPLER = 10,
+ WINED3DSPR_CONST2 = 11,
+ WINED3DSPR_CONST3 = 12,
+ WINED3DSPR_CONST4 = 13,
+ WINED3DSPR_CONSTBOOL = 14,
+ WINED3DSPR_LOOP = 15,
+ WINED3DSPR_TEMPFLOAT16 = 16,
+ WINED3DSPR_MISCTYPE = 17,
+ WINED3DSPR_LABEL = 18,
+ WINED3DSPR_PREDICATE = 19,
+} WINED3DSHADER_PARAM_REGISTER_TYPE;
+
+typedef enum _WINED3DVS_RASTOUT_OFFSETS
+{
+ WINED3DSRO_POSITION = 0,
+ WINED3DSRO_FOG = 1,
+ WINED3DSRO_POINT_SIZE = 2,
+} WINED3DVS_RASTOUT_OFFSETS;
+
+#define WINED3DSP_NOSWIZZLE (0 | (1 << 2) | (2 << 4) | (3 << 6))
+
+typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE
+{
+ WINED3DSPSM_NONE = 0,
+ WINED3DSPSM_NEG = 1,
+ WINED3DSPSM_BIAS = 2,
+ WINED3DSPSM_BIASNEG = 3,
+ WINED3DSPSM_SIGN = 4,
+ WINED3DSPSM_SIGNNEG = 5,
+ WINED3DSPSM_COMP = 6,
+ WINED3DSPSM_X2 = 7,
+ WINED3DSPSM_X2NEG = 8,
+ WINED3DSPSM_DZ = 9,
+ WINED3DSPSM_DW = 10,
+ WINED3DSPSM_ABS = 11,
+ WINED3DSPSM_ABSNEG = 12,
+ WINED3DSPSM_NOT = 13,
+} WINED3DSHADER_PARAM_SRCMOD_TYPE;
+
+#define WINED3DSP_WRITEMASK_0 0x00010000 /* .x r */
+#define WINED3DSP_WRITEMASK_1 0x00020000 /* .y g */
+#define WINED3DSP_WRITEMASK_2 0x00040000 /* .z b */
+#define WINED3DSP_WRITEMASK_3 0x00080000 /* .w a */
+#define WINED3DSP_WRITEMASK_ALL 0x000F0000 /* all */
+
+typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE
+{
+ WINED3DSPDM_NONE = 0,
+ WINED3DSPDM_SATURATE = 1,
+ WINED3DSPDM_PARTIALPRECISION = 2,
+ WINED3DSPDM_MSAMPCENTROID = 4,
+} WINED3DSHADER_PARAM_DSTMOD_TYPE;
+
+typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE
+{
+ WINED3DSIO_NOP = 0,
+ WINED3DSIO_MOV = 1,
+ WINED3DSIO_ADD = 2,
+ WINED3DSIO_SUB = 3,
+ WINED3DSIO_MAD = 4,
+ WINED3DSIO_MUL = 5,
+ WINED3DSIO_RCP = 6,
+ WINED3DSIO_RSQ = 7,
+ WINED3DSIO_DP3 = 8,
+ WINED3DSIO_DP4 = 9,
+ WINED3DSIO_MIN = 10,
+ WINED3DSIO_MAX = 11,
+ WINED3DSIO_SLT = 12,
+ WINED3DSIO_SGE = 13,
+ WINED3DSIO_EXP = 14,
+ WINED3DSIO_LOG = 15,
+ WINED3DSIO_LIT = 16,
+ WINED3DSIO_DST = 17,
+ WINED3DSIO_LRP = 18,
+ WINED3DSIO_FRC = 19,
+ WINED3DSIO_M4x4 = 20,
+ WINED3DSIO_M4x3 = 21,
+ WINED3DSIO_M3x4 = 22,
+ WINED3DSIO_M3x3 = 23,
+ WINED3DSIO_M3x2 = 24,
+ WINED3DSIO_CALL = 25,
+ WINED3DSIO_CALLNZ = 26,
+ WINED3DSIO_LOOP = 27,
+ WINED3DSIO_RET = 28,
+ WINED3DSIO_ENDLOOP = 29,
+ WINED3DSIO_LABEL = 30,
+ WINED3DSIO_DCL = 31,
+ WINED3DSIO_POW = 32,
+ WINED3DSIO_CRS = 33,
+ WINED3DSIO_SGN = 34,
+ WINED3DSIO_ABS = 35,
+ WINED3DSIO_NRM = 36,
+ WINED3DSIO_SINCOS = 37,
+ WINED3DSIO_REP = 38,
+ WINED3DSIO_ENDREP = 39,
+ WINED3DSIO_IF = 40,
+ WINED3DSIO_IFC = 41,
+ WINED3DSIO_ELSE = 42,
+ WINED3DSIO_ENDIF = 43,
+ WINED3DSIO_BREAK = 44,
+ WINED3DSIO_BREAKC = 45,
+ WINED3DSIO_MOVA = 46,
+ WINED3DSIO_DEFB = 47,
+ WINED3DSIO_DEFI = 48,
+
+ WINED3DSIO_TEXCOORD = 64,
+ WINED3DSIO_TEXKILL = 65,
+ WINED3DSIO_TEX = 66,
+ WINED3DSIO_TEXBEM = 67,
+ WINED3DSIO_TEXBEML = 68,
+ WINED3DSIO_TEXREG2AR = 69,
+ WINED3DSIO_TEXREG2GB = 70,
+ WINED3DSIO_TEXM3x2PAD = 71,
+ WINED3DSIO_TEXM3x2TEX = 72,
+ WINED3DSIO_TEXM3x3PAD = 73,
+ WINED3DSIO_TEXM3x3TEX = 74,
+ WINED3DSIO_TEXM3x3DIFF = 75,
+ WINED3DSIO_TEXM3x3SPEC = 76,
+ WINED3DSIO_TEXM3x3VSPEC = 77,
+ WINED3DSIO_EXPP = 78,
+ WINED3DSIO_LOGP = 79,
+ WINED3DSIO_CND = 80,
+ WINED3DSIO_DEF = 81,
+ WINED3DSIO_TEXREG2RGB = 82,
+ WINED3DSIO_TEXDP3TEX = 83,
+ WINED3DSIO_TEXM3x2DEPTH = 84,
+ WINED3DSIO_TEXDP3 = 85,
+ WINED3DSIO_TEXM3x3 = 86,
+ WINED3DSIO_TEXDEPTH = 87,
+ WINED3DSIO_CMP = 88,
+ WINED3DSIO_BEM = 89,
+ WINED3DSIO_DP2ADD = 90,
+ WINED3DSIO_DSX = 91,
+ WINED3DSIO_DSY = 92,
+ WINED3DSIO_TEXLDD = 93,
+ WINED3DSIO_SETP = 94,
+ WINED3DSIO_TEXLDL = 95,
+ WINED3DSIO_BREAKP = 96,
+
+ WINED3DSIO_PHASE = 0xfffd,
+ WINED3DSIO_COMMENT = 0xfffe,
+ WINED3DSIO_END = 0Xffff,
+} WINED3DSHADER_INSTRUCTION_OPCODE_TYPE;
+
+/* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */
+#define WINED3DSI_TEXLD_PROJECT 1
+#define WINED3DSI_TEXLD_BIAS 2
+
+typedef enum COMPARISON_TYPE
+{
+ COMPARISON_GT = 1,
+ COMPARISON_EQ = 2,
+ COMPARISON_GE = 3,
+ COMPARISON_LT = 4,
+ COMPARISON_NE = 5,
+ COMPARISON_LE = 6,
+} COMPARISON_TYPE;
+
+/* Shader version tokens, and shader end tokens */
+#define WINED3DPS_VERSION(major, minor) (0xffff0000 | ((major) << 8) | (minor))
+#define WINED3DVS_VERSION(major, minor) (0xfffe0000 | ((major) << 8) | (minor))
+#define WINED3DSHADER_VERSION_MAJOR(version) (((version) >> 8) & 0xff)
+#define WINED3DSHADER_VERSION_MINOR(version) (((version) >> 0) & 0xff)
+#define WINED3DPS_END() 0x0000ffff
+#define WINED3DVS_END() 0x0000ffff
+
/* Shader backends */
/* TODO: Make this dynamic, based on shader limits ? */
@@ -1190,6 +1378,9 @@ void dumpResources(struct list *list);
*/
#define WINED3D_UNMAPPED_STAGE ~0U
+/* Multithreaded flag. Removed from the public header to signal that IWineD3D::CreateDevice ignores it */
+#define WINED3DCREATE_MULTITHREADED 0x00000004
+
struct IWineD3DDeviceImpl
{
/* IUnknown fields */
@@ -2251,15 +2442,6 @@ typedef struct local_constant {
DWORD value[4];
} local_constant;
-typedef enum COMPARISON_TYPE {
- COMPARISON_GT = 1,
- COMPARISON_EQ = 2,
- COMPARISON_GE = 3,
- COMPARISON_LT = 4,
- COMPARISON_NE = 5,
- COMPARISON_LE = 6
-} COMPARISON_TYPE;
-
typedef struct SHADER_LIMITS {
unsigned int temporary;
unsigned int texcoord;
@@ -2531,6 +2713,14 @@ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth);
* Pixel format management
*/
+/* WineD3D pixel format flags */
+#define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x1
+#define WINED3DFMT_FLAG_FILTERING 0x2
+#define WINED3DFMT_FLAG_DEPTH 0x4
+#define WINED3DFMT_FLAG_STENCIL 0x8
+#define WINED3DFMT_FLAG_RENDERTARGET 0x10
+#define WINED3DFMT_FLAG_FOURCC 0x20
+
struct GlPixelFormatDesc
{
WINED3DFORMAT format;
diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h
deleted file mode 100644
index 30d6900..0000000
--- a/dlls/wined3d/wined3d_private_types.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Direct3D wine internal header: D3D equivalent types
- *
- * Copyright 2002-2003 Jason Edmeades
- * Copyright 2002-2003 Raphael Junqueira
- * Copyright 2005 Oliver Stieber
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __WINE_WINED3D_TYPES_INTERNAL_H
-#define __WINE_WINED3D_TYPES_INTERNAL_H
-
-/* WineD3D pixel format flags */
-#define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x1
-#define WINED3DFMT_FLAG_FILTERING 0x2
-#define WINED3DFMT_FLAG_DEPTH 0x4
-#define WINED3DFMT_FLAG_STENCIL 0x8
-#define WINED3DFMT_FLAG_RENDERTARGET 0x10
-#define WINED3DFMT_FLAG_FOURCC 0x20
-
-typedef enum _WINED3DSAMPLER_TEXTURE_TYPE
-{
- WINED3DSTT_UNKNOWN = 0,
- WINED3DSTT_1D = 1,
- WINED3DSTT_2D = 2,
- WINED3DSTT_CUBE = 3,
- WINED3DSTT_VOLUME = 4,
-
- WINED3DSTT_FORCE_DWORD = 0x7FFFFFFF
-} WINED3DSAMPLER_TEXTURE_TYPE;
-
-/** Register types **/
-typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE {
- WINED3DSPR_TEMP = 0,
- WINED3DSPR_INPUT = 1,
- WINED3DSPR_CONST = 2,
- WINED3DSPR_ADDR = 3,
- WINED3DSPR_TEXTURE = 3,
- WINED3DSPR_RASTOUT = 4,
- WINED3DSPR_ATTROUT = 5,
- WINED3DSPR_TEXCRDOUT = 6,
- WINED3DSPR_OUTPUT = 6,
- WINED3DSPR_CONSTINT = 7,
- WINED3DSPR_COLOROUT = 8,
- WINED3DSPR_DEPTHOUT = 9,
- WINED3DSPR_SAMPLER = 10,
- WINED3DSPR_CONST2 = 11,
- WINED3DSPR_CONST3 = 12,
- WINED3DSPR_CONST4 = 13,
- WINED3DSPR_CONSTBOOL = 14,
- WINED3DSPR_LOOP = 15,
- WINED3DSPR_TEMPFLOAT16 = 16,
- WINED3DSPR_MISCTYPE = 17,
- WINED3DSPR_LABEL = 18,
- WINED3DSPR_PREDICATE = 19,
-
- WINED3DSPR_FORCE_DWORD = 0x7FFFFFFF
-} WINED3DSHADER_PARAM_REGISTER_TYPE;
-
-/* RASTOUT register offsets */
-typedef enum _WINED3DVS_RASTOUT_OFFSETS {
- WINED3DSRO_POSITION = 0,
- WINED3DSRO_FOG = 1,
- WINED3DSRO_POINT_SIZE = 2,
-
- WINED3DSRO_FORCE_DWORD = 0x7FFFFFFF
-} WINED3DVS_RASTOUT_OFFSETS;
-
-#define WINED3DSP_NOSWIZZLE (0 | (1 << 2) | (2 << 4) | (3 << 6))
-
-typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE {
- WINED3DSPSM_NONE = 0,
- WINED3DSPSM_NEG = 1,
- WINED3DSPSM_BIAS = 2,
- WINED3DSPSM_BIASNEG = 3,
- WINED3DSPSM_SIGN = 4,
- WINED3DSPSM_SIGNNEG = 5,
- WINED3DSPSM_COMP = 6,
- WINED3DSPSM_X2 = 7,
- WINED3DSPSM_X2NEG = 8,
- WINED3DSPSM_DZ = 9,
- WINED3DSPSM_DW = 10,
- WINED3DSPSM_ABS = 11,
- WINED3DSPSM_ABSNEG = 12,
- WINED3DSPSM_NOT = 13,
-
- WINED3DSPSM_FORCE_DWORD = 0x7FFFFFFF
-} WINED3DSHADER_PARAM_SRCMOD_TYPE;
-
-/** Destination register modifiers **/
-#define WINED3DSP_WRITEMASK_0 0x00010000 /* .x r */
-#define WINED3DSP_WRITEMASK_1 0x00020000 /* .y g */
-#define WINED3DSP_WRITEMASK_2 0x00040000 /* .z b */
-#define WINED3DSP_WRITEMASK_3 0x00080000 /* .w a */
-#define WINED3DSP_WRITEMASK_ALL 0x000F0000 /* all */
-
-typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE {
- WINED3DSPDM_NONE = 0,
- WINED3DSPDM_SATURATE = 1,
- WINED3DSPDM_PARTIALPRECISION = 2,
- WINED3DSPDM_MSAMPCENTROID = 4,
-
- WINED3DSPDM_FORCE_DWORD = 0x7FFFFFFF
-} WINED3DSHADER_PARAM_DSTMOD_TYPE;
-
-/** Opcode types */
-typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE {
- WINED3DSIO_NOP = 0,
- WINED3DSIO_MOV = 1,
- WINED3DSIO_ADD = 2,
- WINED3DSIO_SUB = 3,
- WINED3DSIO_MAD = 4,
- WINED3DSIO_MUL = 5,
- WINED3DSIO_RCP = 6,
- WINED3DSIO_RSQ = 7,
- WINED3DSIO_DP3 = 8,
- WINED3DSIO_DP4 = 9,
- WINED3DSIO_MIN = 10,
- WINED3DSIO_MAX = 11,
- WINED3DSIO_SLT = 12,
- WINED3DSIO_SGE = 13,
- WINED3DSIO_EXP = 14,
- WINED3DSIO_LOG = 15,
- WINED3DSIO_LIT = 16,
- WINED3DSIO_DST = 17,
- WINED3DSIO_LRP = 18,
- WINED3DSIO_FRC = 19,
- WINED3DSIO_M4x4 = 20,
- WINED3DSIO_M4x3 = 21,
- WINED3DSIO_M3x4 = 22,
- WINED3DSIO_M3x3 = 23,
- WINED3DSIO_M3x2 = 24,
- WINED3DSIO_CALL = 25,
- WINED3DSIO_CALLNZ = 26,
- WINED3DSIO_LOOP = 27,
- WINED3DSIO_RET = 28,
- WINED3DSIO_ENDLOOP = 29,
- WINED3DSIO_LABEL = 30,
- WINED3DSIO_DCL = 31,
- WINED3DSIO_POW = 32,
- WINED3DSIO_CRS = 33,
- WINED3DSIO_SGN = 34,
- WINED3DSIO_ABS = 35,
- WINED3DSIO_NRM = 36,
- WINED3DSIO_SINCOS = 37,
- WINED3DSIO_REP = 38,
- WINED3DSIO_ENDREP = 39,
- WINED3DSIO_IF = 40,
- WINED3DSIO_IFC = 41,
- WINED3DSIO_ELSE = 42,
- WINED3DSIO_ENDIF = 43,
- WINED3DSIO_BREAK = 44,
- WINED3DSIO_BREAKC = 45,
- WINED3DSIO_MOVA = 46,
- WINED3DSIO_DEFB = 47,
- WINED3DSIO_DEFI = 48,
-
- WINED3DSIO_TEXCOORD = 64,
- WINED3DSIO_TEXKILL = 65,
- WINED3DSIO_TEX = 66,
- WINED3DSIO_TEXBEM = 67,
- WINED3DSIO_TEXBEML = 68,
- WINED3DSIO_TEXREG2AR = 69,
- WINED3DSIO_TEXREG2GB = 70,
- WINED3DSIO_TEXM3x2PAD = 71,
- WINED3DSIO_TEXM3x2TEX = 72,
- WINED3DSIO_TEXM3x3PAD = 73,
- WINED3DSIO_TEXM3x3TEX = 74,
- WINED3DSIO_TEXM3x3DIFF = 75,
- WINED3DSIO_TEXM3x3SPEC = 76,
- WINED3DSIO_TEXM3x3VSPEC = 77,
- WINED3DSIO_EXPP = 78,
- WINED3DSIO_LOGP = 79,
- WINED3DSIO_CND = 80,
- WINED3DSIO_DEF = 81,
- WINED3DSIO_TEXREG2RGB = 82,
- WINED3DSIO_TEXDP3TEX = 83,
- WINED3DSIO_TEXM3x2DEPTH = 84,
- WINED3DSIO_TEXDP3 = 85,
- WINED3DSIO_TEXM3x3 = 86,
- WINED3DSIO_TEXDEPTH = 87,
- WINED3DSIO_CMP = 88,
- WINED3DSIO_BEM = 89,
- WINED3DSIO_DP2ADD = 90,
- WINED3DSIO_DSX = 91,
- WINED3DSIO_DSY = 92,
- WINED3DSIO_TEXLDD = 93,
- WINED3DSIO_SETP = 94,
- WINED3DSIO_TEXLDL = 95,
- WINED3DSIO_BREAKP = 96,
-
- WINED3DSIO_PHASE = 0xFFFD,
- WINED3DSIO_COMMENT = 0xFFFE,
- WINED3DSIO_END = 0XFFFF,
-
- WINED3DSIO_FORCE_DWORD = 0X7FFFFFFF /** for 32-bit alignment */
-} WINED3DSHADER_INSTRUCTION_OPCODE_TYPE;
-
-/* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */
-#define WINED3DSI_TEXLD_PROJECT 1
-#define WINED3DSI_TEXLD_BIAS 2
-
-/** Shader version tokens, and shader end tokens **/
-
-#define WINED3DPS_VERSION(major, minor) (0xFFFF0000 | ((major) << 8) | (minor))
-#define WINED3DVS_VERSION(major, minor) (0xFFFE0000 | ((major) << 8) | (minor))
-#define WINED3DSHADER_VERSION_MAJOR(version) (((version) >> 8) & 0xFF)
-#define WINED3DSHADER_VERSION_MINOR(version) (((version) >> 0) & 0xFF)
-#define WINED3DPS_END() 0x0000FFFF
-#define WINED3DVS_END() 0x0000FFFF
-
-/* Multithreaded flag. Removed from the public header to signal that IWineD3D::CreateDevice ignores it */
-#define WINED3DCREATE_MULTITHREADED 0x00000004
-
-#endif
--
1.6.0.6
--------------010903080509050902070401--
More information about the wine-patches
mailing list