From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- dlls/d3dcompiler_43/d3dcompiler_private.h | 74 +++++++++++------------ dlls/d3dcompiler_43/utils.h | 2 +- 2 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 12db34891e0..c1349fbfc4d 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -48,9 +48,9 @@ #define D3DERR_INVALIDCALL 0x8876086c
/* TRACE helper functions */ -const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) DECLSPEC_HIDDEN; -const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c) DECLSPEC_HIDDEN; -const char *debug_d3dcompiler_shader_variable_type(D3D_SHADER_VARIABLE_TYPE t) DECLSPEC_HIDDEN; +const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part); +const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c); +const char *debug_d3dcompiler_shader_variable_type(D3D_SHADER_VARIABLE_TYPE t);
enum shader_type { @@ -221,14 +221,14 @@ struct asmparser_backend const struct src_regs *srcs, int expectednsrcs); };
-struct instruction *alloc_instr(unsigned int srcs) DECLSPEC_HIDDEN; -BOOL add_instruction(struct bwriter_shader *shader, struct instruction *instr) DECLSPEC_HIDDEN; -BOOL add_constF(struct bwriter_shader *shader, uint32_t reg, float x, float y, float z, float w) DECLSPEC_HIDDEN; -BOOL add_constI(struct bwriter_shader *shader, uint32_t reg, int x, int y, int z, int w) DECLSPEC_HIDDEN; -BOOL add_constB(struct bwriter_shader *shader, uint32_t reg, BOOL x) DECLSPEC_HIDDEN; +struct instruction *alloc_instr(unsigned int srcs); +BOOL add_instruction(struct bwriter_shader *shader, struct instruction *instr); +BOOL add_constF(struct bwriter_shader *shader, uint32_t reg, float x, float y, float z, float w); +BOOL add_constI(struct bwriter_shader *shader, uint32_t reg, int x, int y, int z, int w); +BOOL add_constB(struct bwriter_shader *shader, uint32_t reg, BOOL x); BOOL record_declaration(struct bwriter_shader *shader, uint32_t usage, uint32_t usage_idx, - uint32_t mod, BOOL output, uint32_t regnum, uint32_t writemask, BOOL builtin) DECLSPEC_HIDDEN; -BOOL record_sampler(struct bwriter_shader *shader, uint32_t samptype, uint32_t mod, uint32_t regnum) DECLSPEC_HIDDEN; + uint32_t mod, BOOL output, uint32_t regnum, uint32_t writemask, BOOL builtin); +BOOL record_sampler(struct bwriter_shader *shader, uint32_t samptype, uint32_t mod, uint32_t regnum);
#define MESSAGEBUFFER_INITIAL_SIZE 256
@@ -260,23 +260,23 @@ struct asm_parser unsigned int line_no; };
-extern struct asm_parser asm_ctx DECLSPEC_HIDDEN; +extern struct asm_parser asm_ctx;
-void create_vs10_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_vs11_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_vs20_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_vs2x_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_vs30_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps10_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps11_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps12_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps13_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps14_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps20_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps2x_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps30_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_vs10_parser(struct asm_parser *ret); +void create_vs11_parser(struct asm_parser *ret); +void create_vs20_parser(struct asm_parser *ret); +void create_vs2x_parser(struct asm_parser *ret); +void create_vs30_parser(struct asm_parser *ret); +void create_ps10_parser(struct asm_parser *ret); +void create_ps11_parser(struct asm_parser *ret); +void create_ps12_parser(struct asm_parser *ret); +void create_ps13_parser(struct asm_parser *ret); +void create_ps14_parser(struct asm_parser *ret); +void create_ps20_parser(struct asm_parser *ret); +void create_ps2x_parser(struct asm_parser *ret); +void create_ps30_parser(struct asm_parser *ret);
-struct bwriter_shader *parse_asm_shader(char **messages) DECLSPEC_HIDDEN; +struct bwriter_shader *parse_asm_shader(char **messages);
#ifdef __GNUC__ #define PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) @@ -284,8 +284,8 @@ struct bwriter_shader *parse_asm_shader(char **messages) DECLSPEC_HIDDEN; #define PRINTF_ATTR(fmt,args) #endif
-void compilation_message(struct compilation_messages *msg, const char *fmt, va_list args) DECLSPEC_HIDDEN; -void WINAPIV asmparser_message(struct asm_parser *ctx, const char *fmt, ...) PRINTF_ATTR(2,3) DECLSPEC_HIDDEN; +void compilation_message(struct compilation_messages *msg, const char *fmt, va_list args); +void WINAPIV asmparser_message(struct asm_parser *ctx, const char *fmt, ...) PRINTF_ATTR(2,3); static inline void set_parse_status(enum parse_status *current, enum parse_status update) { if (update == PARSE_ERR) @@ -295,13 +295,13 @@ static inline void set_parse_status(enum parse_status *current, enum parse_statu }
/* Debug utility routines */ -const char *debug_print_srcmod(uint32_t mod) DECLSPEC_HIDDEN; -const char *debug_print_dstmod(uint32_t mod) DECLSPEC_HIDDEN; -const char *debug_print_shift(uint32_t shift) DECLSPEC_HIDDEN; -const char *debug_print_dstreg(const struct shader_reg *reg) DECLSPEC_HIDDEN; -const char *debug_print_srcreg(const struct shader_reg *reg) DECLSPEC_HIDDEN; -const char *debug_print_comp(uint32_t comp) DECLSPEC_HIDDEN; -const char *debug_print_opcode(uint32_t opcode) DECLSPEC_HIDDEN; +const char *debug_print_srcmod(uint32_t mod); +const char *debug_print_dstmod(uint32_t mod); +const char *debug_print_shift(uint32_t shift); +const char *debug_print_dstreg(const struct shader_reg *reg); +const char *debug_print_srcreg(const struct shader_reg *reg); +const char *debug_print_comp(uint32_t comp); +const char *debug_print_opcode(uint32_t opcode);
/* Used to signal an incorrect swizzle/writemask */ #define SWIZZLE_ERR ~0U @@ -530,9 +530,9 @@ enum bwriterdeclusage #define T2_REG 4 #define T3_REG 5
-struct bwriter_shader *SlAssembleShader(const char *text, char **messages) DECLSPEC_HIDDEN; -HRESULT shader_write_bytecode(const struct bwriter_shader *shader, uint32_t **result, uint32_t *size) DECLSPEC_HIDDEN; -void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; +struct bwriter_shader *SlAssembleShader(const char *text, char **messages); +HRESULT shader_write_bytecode(const struct bwriter_shader *shader, uint32_t **result, uint32_t *size); +void SlDeleteShader(struct bwriter_shader *shader);
#define DXBC_HEADER_SIZE (8 * sizeof(uint32_t))
diff --git a/dlls/d3dcompiler_43/utils.h b/dlls/d3dcompiler_43/utils.h index 5259c057f6e..f587778d13e 100644 --- a/dlls/d3dcompiler_43/utils.h +++ b/dlls/d3dcompiler_43/utils.h @@ -30,6 +30,6 @@ static inline uint32_t read_u32(const char **ptr) return r; }
-void skip_u32_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; +void skip_u32_unknown(const char **ptr, unsigned int count);
#endif /* __WINE_UTILS_H */