Henri Verbeet : d3dcompiler: Get rid of the BWRITERSAMPLER_TEXTURE_TYPE typedef.
Alexandre Julliard
julliard at winehq.org
Thu Oct 3 15:18:01 CDT 2013
Module: wine
Branch: master
Commit: 540054eb3e8f9db79c7956e67c0c7dc5a3c8cacb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=540054eb3e8f9db79c7956e67c0c7dc5a3c8cacb
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Oct 3 08:54:14 2013 +0200
d3dcompiler: Get rid of the BWRITERSAMPLER_TEXTURE_TYPE typedef.
---
dlls/d3dcompiler_43/asmshader.y | 2 +-
dlls/d3dcompiler_43/d3dcompiler_private.h | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y
index c0e0793..5948d57 100644
--- a/dlls/d3dcompiler_43/asmshader.y
+++ b/dlls/d3dcompiler_43/asmshader.y
@@ -97,7 +97,7 @@ int asmshader_lex(void);
DWORD dclusage;
unsigned int regnum;
} declaration;
- BWRITERSAMPLER_TEXTURE_TYPE samplertype;
+ enum bwritersampler_texture_type samplertype;
struct rel_reg rel_reg;
struct src_regs sregs;
}
diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h
index 0d40664..361845f 100644
--- a/dlls/d3dcompiler_43/d3dcompiler_private.h
+++ b/dlls/d3dcompiler_43/d3dcompiler_private.h
@@ -502,13 +502,14 @@ enum bwritershader_param_dstmod_type
BWRITERSPDM_MSAMPCENTROID = 4,
};
-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
More information about the wine-cvs
mailing list