Commit b5d610ca authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard

d3d10: Use more consistent integer data types.

parent 812ab928
......@@ -20,6 +20,7 @@
#define __WINE_D3D10_PRIVATE_H
#include <math.h>
#include <stdint.h>
#include "wine/debug.h"
#include "wine/rbtree.h"
......@@ -73,8 +74,8 @@ struct d3d10_effect_shader_resource
struct d3d10_effect_shader_signature
{
char *signature;
UINT signature_size;
UINT element_count;
unsigned int signature_size;
unsigned int element_count;
D3D10_SIGNATURE_PARAMETER_DESC *elements;
};
......@@ -160,13 +161,13 @@ struct d3d10_effect_type
struct wine_rb_entry entry;
struct d3d10_effect *effect;
DWORD element_count;
DWORD size_unpacked;
DWORD stride;
DWORD size_packed;
DWORD member_count;
DWORD column_count;
DWORD row_count;
unsigned int element_count;
unsigned int size_unpacked;
unsigned int stride;
unsigned int size_packed;
unsigned int member_count;
unsigned int column_count;
unsigned int row_count;
struct d3d10_effect_type *elementtype;
struct d3d10_effect_type_member *members;
};
......@@ -175,7 +176,7 @@ struct d3d10_effect_type_member
{
char *name;
char *semantic;
DWORD buffer_offset;
uint32_t buffer_offset;
struct d3d10_effect_type *type;
};
......@@ -195,10 +196,10 @@ struct d3d10_effect_variable
char *name;
char *semantic;
DWORD buffer_offset;
DWORD flag;
DWORD data_size;
DWORD explicit_bind_point;
uint32_t buffer_offset;
uint32_t flag;
uint32_t data_size;
unsigned int explicit_bind_point;
struct d3d10_effect *effect;
struct d3d10_effect_variable *elements;
struct d3d10_effect_variable *members;
......@@ -248,7 +249,7 @@ struct d3d10_effect_technique
struct d3d10_effect *effect;
char *name;
struct d3d10_effect_annotations annotations;
DWORD pass_count;
unsigned int pass_count;
struct d3d10_effect_pass *passes;
};
......@@ -280,19 +281,19 @@ struct d3d10_effect
ID3D10Device *device;
struct d3d10_effect *pool;
DWORD version;
DWORD local_buffer_count;
DWORD variable_count;
DWORD local_variable_count;
DWORD shared_buffer_count;
DWORD shared_object_count;
DWORD technique_count;
DWORD index_offset;
DWORD texture_count;
DWORD anonymous_shader_count;
DWORD flags;
DWORD anonymous_shader_current;
uint32_t version;
unsigned int local_buffer_count;
unsigned int variable_count;
unsigned int local_variable_count;
unsigned int shared_buffer_count;
unsigned int shared_object_count;
unsigned int technique_count;
uint32_t index_offset;
unsigned int texture_count;
unsigned int anonymous_shader_count;
uint32_t flags;
unsigned int anonymous_shader_current;
struct wine_rb_tree types;
struct d3d10_effect_variable *local_buffers;
......@@ -308,7 +309,9 @@ struct d3d10_effect
struct d3d10_effect_technique *techniques;
};
HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T data_size) DECLSPEC_HIDDEN;
HRESULT d3d10_effect_parse(struct d3d10_effect *effect, const void *data, SIZE_T data_size) DECLSPEC_HIDDEN;
void skip_u32_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN;
/* D3D10Core */
HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment