d3d10: Use more consistent integer data types.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
812ab92877
commit
b5d610ca37
|
@ -20,6 +20,7 @@
|
||||||
#define __WINE_D3D10_PRIVATE_H
|
#define __WINE_D3D10_PRIVATE_H
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
#include "wine/rbtree.h"
|
#include "wine/rbtree.h"
|
||||||
|
@ -73,8 +74,8 @@ struct d3d10_effect_shader_resource
|
||||||
struct d3d10_effect_shader_signature
|
struct d3d10_effect_shader_signature
|
||||||
{
|
{
|
||||||
char *signature;
|
char *signature;
|
||||||
UINT signature_size;
|
unsigned int signature_size;
|
||||||
UINT element_count;
|
unsigned int element_count;
|
||||||
D3D10_SIGNATURE_PARAMETER_DESC *elements;
|
D3D10_SIGNATURE_PARAMETER_DESC *elements;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -160,13 +161,13 @@ struct d3d10_effect_type
|
||||||
struct wine_rb_entry entry;
|
struct wine_rb_entry entry;
|
||||||
struct d3d10_effect *effect;
|
struct d3d10_effect *effect;
|
||||||
|
|
||||||
DWORD element_count;
|
unsigned int element_count;
|
||||||
DWORD size_unpacked;
|
unsigned int size_unpacked;
|
||||||
DWORD stride;
|
unsigned int stride;
|
||||||
DWORD size_packed;
|
unsigned int size_packed;
|
||||||
DWORD member_count;
|
unsigned int member_count;
|
||||||
DWORD column_count;
|
unsigned int column_count;
|
||||||
DWORD row_count;
|
unsigned int row_count;
|
||||||
struct d3d10_effect_type *elementtype;
|
struct d3d10_effect_type *elementtype;
|
||||||
struct d3d10_effect_type_member *members;
|
struct d3d10_effect_type_member *members;
|
||||||
};
|
};
|
||||||
|
@ -175,7 +176,7 @@ struct d3d10_effect_type_member
|
||||||
{
|
{
|
||||||
char *name;
|
char *name;
|
||||||
char *semantic;
|
char *semantic;
|
||||||
DWORD buffer_offset;
|
uint32_t buffer_offset;
|
||||||
struct d3d10_effect_type *type;
|
struct d3d10_effect_type *type;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -195,10 +196,10 @@ struct d3d10_effect_variable
|
||||||
|
|
||||||
char *name;
|
char *name;
|
||||||
char *semantic;
|
char *semantic;
|
||||||
DWORD buffer_offset;
|
uint32_t buffer_offset;
|
||||||
DWORD flag;
|
uint32_t flag;
|
||||||
DWORD data_size;
|
uint32_t data_size;
|
||||||
DWORD explicit_bind_point;
|
unsigned int explicit_bind_point;
|
||||||
struct d3d10_effect *effect;
|
struct d3d10_effect *effect;
|
||||||
struct d3d10_effect_variable *elements;
|
struct d3d10_effect_variable *elements;
|
||||||
struct d3d10_effect_variable *members;
|
struct d3d10_effect_variable *members;
|
||||||
|
@ -248,7 +249,7 @@ struct d3d10_effect_technique
|
||||||
struct d3d10_effect *effect;
|
struct d3d10_effect *effect;
|
||||||
char *name;
|
char *name;
|
||||||
struct d3d10_effect_annotations annotations;
|
struct d3d10_effect_annotations annotations;
|
||||||
DWORD pass_count;
|
unsigned int pass_count;
|
||||||
struct d3d10_effect_pass *passes;
|
struct d3d10_effect_pass *passes;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -280,19 +281,19 @@ struct d3d10_effect
|
||||||
|
|
||||||
ID3D10Device *device;
|
ID3D10Device *device;
|
||||||
struct d3d10_effect *pool;
|
struct d3d10_effect *pool;
|
||||||
DWORD version;
|
uint32_t version;
|
||||||
DWORD local_buffer_count;
|
unsigned int local_buffer_count;
|
||||||
DWORD variable_count;
|
unsigned int variable_count;
|
||||||
DWORD local_variable_count;
|
unsigned int local_variable_count;
|
||||||
DWORD shared_buffer_count;
|
unsigned int shared_buffer_count;
|
||||||
DWORD shared_object_count;
|
unsigned int shared_object_count;
|
||||||
DWORD technique_count;
|
unsigned int technique_count;
|
||||||
DWORD index_offset;
|
uint32_t index_offset;
|
||||||
DWORD texture_count;
|
unsigned int texture_count;
|
||||||
DWORD anonymous_shader_count;
|
unsigned int anonymous_shader_count;
|
||||||
DWORD flags;
|
uint32_t flags;
|
||||||
|
|
||||||
DWORD anonymous_shader_current;
|
unsigned int anonymous_shader_current;
|
||||||
|
|
||||||
struct wine_rb_tree types;
|
struct wine_rb_tree types;
|
||||||
struct d3d10_effect_variable *local_buffers;
|
struct d3d10_effect_variable *local_buffers;
|
||||||
|
@ -308,7 +309,9 @@ struct d3d10_effect
|
||||||
struct d3d10_effect_technique *techniques;
|
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 */
|
/* D3D10Core */
|
||||||
HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter,
|
HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter,
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue