* Sync up to trunk HEAD (r62975).

[reactos.git] / dll / directx / wine / d3dcompiler_43 / d3dcompiler_private.h

diff --git a/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h b/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h
index c530489..0e887d0 100644 (file)
--- a/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h
+++ b/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h
@@ -57,7 +57,8 @@ enum shader_type
     ST_PIXEL
 };
 
-typedef enum BWRITER_COMPARISON_TYPE {
+enum bwriter_comparison_type
+{
     BWRITER_COMPARISON_NONE,
     BWRITER_COMPARISON_GT,
     BWRITER_COMPARISON_EQ,
@@ -65,7 +66,7 @@ typedef enum BWRITER_COMPARISON_TYPE {
     BWRITER_COMPARISON_LT,
     BWRITER_COMPARISON_NE,
     BWRITER_COMPARISON_LE
-} BWRITER_COMPARISON_TYPE;
+};
 
 struct constant {
     DWORD                   regnum;
@@ -92,7 +93,7 @@ struct instruction {
     DWORD                   opcode;
     DWORD                   dstmod;
     DWORD                   shift;
-    BWRITER_COMPARISON_TYPE comptype;
+    enum bwriter_comparison_type comptype;
     BOOL                    has_dst;
     struct shader_reg       dst;
     struct shader_reg       *src;
@@ -218,9 +219,9 @@ struct asmparser_backend {
 
     void (*end)(struct asm_parser *This);
 
-    void (*instr)(struct asm_parser *This, DWORD opcode, DWORD mod, DWORD shift,
-                  BWRITER_COMPARISON_TYPE comp, const struct shader_reg *dst,
-                  const struct src_regs *srcs, int expectednsrcs);
+    void (*instr)(struct asm_parser *parser, DWORD opcode, DWORD mod, DWORD shift,
+            enum bwriter_comparison_type comp, const struct shader_reg *dst,
+            const struct src_regs *srcs, int expectednsrcs);
 };
 
 struct instruction *alloc_instr(unsigned int srcs) DECLSPEC_HIDDEN;
@@ -367,11 +368,10 @@ const char *debug_print_opcode(DWORD opcode) DECLSPEC_HIDDEN;
 /* Used to signal an incorrect swizzle/writemask */
 #define SWIZZLE_ERR ~0U
 
-/*
-  Enumerations and defines used in the bytecode writer
-  intermediate representation
-*/
-typedef enum _BWRITERSHADER_INSTRUCTION_OPCODE_TYPE {
+/* Enumerations and defines used in the bytecode writer intermediate
+ * representation. */
+enum bwritershader_instruction_opcode_type
+{
     BWRITERSIO_NOP,
     BWRITERSIO_MOV,
     BWRITERSIO_ADD,
@@ -460,9 +460,10 @@ typedef enum _BWRITERSHADER_INSTRUCTION_OPCODE_TYPE {
     BWRITERSIO_PHASE,
     BWRITERSIO_COMMENT,
     BWRITERSIO_END,
-} BWRITERSHADER_INSTRUCTION_OPCODE_TYPE;
+};
 
-typedef enum _BWRITERSHADER_PARAM_REGISTER_TYPE {
+enum bwritershader_param_register_type
+{
     BWRITERSPR_TEMP,
     BWRITERSPR_INPUT,
     BWRITERSPR_CONST,
@@ -481,14 +482,14 @@ typedef enum _BWRITERSHADER_PARAM_REGISTER_TYPE {
     BWRITERSPR_MISCTYPE,
     BWRITERSPR_LABEL,
     BWRITERSPR_PREDICATE
-} BWRITERSHADER_PARAM_REGISTER_TYPE;
+};
 
-typedef enum _BWRITERVS_RASTOUT_OFFSETS
+enum bwritervs_rastout_offsets
 {
     BWRITERSRO_POSITION,
     BWRITERSRO_FOG,
     BWRITERSRO_POINT_SIZE
-} BWRITERVS_RASTOUT_OFFSETS;
+};
 
 #define BWRITERSP_WRITEMASK_0   0x1 /* .x r */
 #define BWRITERSP_WRITEMASK_1   0x2 /* .y g */
@@ -496,25 +497,28 @@ typedef enum _BWRITERVS_RASTOUT_OFFSETS
 #define BWRITERSP_WRITEMASK_3   0x8 /* .w a */
 #define BWRITERSP_WRITEMASK_ALL 0xf /* all */
 
-typedef enum _BWRITERSHADER_PARAM_DSTMOD_TYPE {
+enum bwritershader_param_dstmod_type
+{
     BWRITERSPDM_NONE = 0,
     BWRITERSPDM_SATURATE = 1,
     BWRITERSPDM_PARTIALPRECISION = 2,
     BWRITERSPDM_MSAMPCENTROID = 4,
-} BWRITERSHADER_PARAM_DSTMOD_TYPE;
+};
 
-typedef enum _BWRITERSAMPLER_TEXTURE_TYPE {
+enum bwritersampler_texture_type
+{
     BWRITERSTT_UNKNOWN = 0,
     BWRITERSTT_1D = 1,
     BWRITERSTT_2D = 2,
     BWRITERSTT_CUBE = 3,
     BWRITERSTT_VOLUME = 4,
-} BWRITERSAMPLER_TEXTURE_TYPE;
+};
 
 #define BWRITERSI_TEXLD_PROJECT 1
 #define BWRITERSI_TEXLD_BIAS    2
 
-typedef enum _BWRITERSHADER_PARAM_SRCMOD_TYPE {
+enum bwritershader_param_srcmod_type
+{
     BWRITERSPSM_NONE = 0,
     BWRITERSPSM_NEG,
     BWRITERSPSM_BIAS,
@@ -529,7 +533,7 @@ typedef enum _BWRITERSHADER_PARAM_SRCMOD_TYPE {
     BWRITERSPSM_ABS,
     BWRITERSPSM_ABSNEG,
     BWRITERSPSM_NOT,
-} BWRITERSHADER_PARAM_SRCMOD_TYPE;
+};
 
 #define BWRITER_SM1_VS  0xfffe
 #define BWRITER_SM1_PS  0xffff
@@ -567,7 +571,8 @@ typedef enum _BWRITERSHADER_PARAM_SRCMOD_TYPE {
 #define BWRITERVS_SWIZZLE_Z (BWRITERVS_X_Z | BWRITERVS_Y_Z | BWRITERVS_Z_Z | BWRITERVS_W_Z)
 #define BWRITERVS_SWIZZLE_W (BWRITERVS_X_W | BWRITERVS_Y_W | BWRITERVS_Z_W | BWRITERVS_W_W)
 
-typedef enum _BWRITERDECLUSAGE {
+enum bwriterdeclusage
+{
     BWRITERDECLUSAGE_POSITION,
     BWRITERDECLUSAGE_BLENDWEIGHT,
     BWRITERDECLUSAGE_BLENDINDICES,
@@ -582,7 +587,7 @@ typedef enum _BWRITERDECLUSAGE {
     BWRITERDECLUSAGE_FOG,
     BWRITERDECLUSAGE_DEPTH,
     BWRITERDECLUSAGE_SAMPLE
-} BWRITERDECLUSAGE;
+};
 
 /* ps 1.x texture registers mappings */
 #define T0_REG          2