Skip to content

W
wine-winehq
Commit f38e94af authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Get rid of the WINED3DTRANSFORMSTATETYPE typedef.

parent d6dfb791
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 85 deletions
dlls/ddraw/device.c
View file @ f38e94af
......@@ -1432,15 +1432,15 @@ IDirect3DDeviceImpl_1_SetMatrix(IDirect3DDevice *iface,
if (D3DMatHandle == This->world)
wined3d_device_set_transform(This->wined3d_device,
WINED3DTS_WORLDMATRIX(0), (struct wined3d_matrix *)D3DMatrix);
WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)D3DMatrix);
if (D3DMatHandle == This->view)
wined3d_device_set_transform(This->wined3d_device,
WINED3DTS_VIEW, (struct wined3d_matrix *)D3DMatrix);
WINED3D_TS_VIEW, (struct wined3d_matrix *)D3DMatrix);
if (D3DMatHandle == This->proj)
wined3d_device_set_transform(This->wined3d_device,
WINED3DTS_PROJECTION, (struct wined3d_matrix *)D3DMatrix);
WINED3D_TS_PROJECTION, (struct wined3d_matrix *)D3DMatrix);
wined3d_mutex_unlock();
......@@ -3231,13 +3231,22 @@ IDirect3DDeviceImpl_7_SetTransform(IDirect3DDevice7 *iface,
TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, Matrix);
switch(TransformStateType)
switch (TransformStateType)
{
case D3DTRANSFORMSTATE_WORLD : type = WINED3DTS_WORLDMATRIX(0); break;
case D3DTRANSFORMSTATE_WORLD1: type = WINED3DTS_WORLDMATRIX(1); break;
case D3DTRANSFORMSTATE_WORLD2: type = WINED3DTS_WORLDMATRIX(2); break;
case D3DTRANSFORMSTATE_WORLD3: type = WINED3DTS_WORLDMATRIX(3); break;
default: type = TransformStateType;
case D3DTRANSFORMSTATE_WORLD:
type = WINED3D_TS_WORLD_MATRIX(0);
break;
case D3DTRANSFORMSTATE_WORLD1:
type = WINED3D_TS_WORLD_MATRIX(1);
break;
case D3DTRANSFORMSTATE_WORLD2:
type = WINED3D_TS_WORLD_MATRIX(2);
break;
case D3DTRANSFORMSTATE_WORLD3:
type = WINED3D_TS_WORLD_MATRIX(3);
break;
default:
type = TransformStateType;
}
if (!Matrix)
......@@ -3292,7 +3301,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_SetTransform(IDirect3DDevice3 *iface
wined3d_mutex_lock();
multiply_matrix(&projection, &This->legacy_clipspace, matrix);
hr = wined3d_device_set_transform(This->wined3d_device,
WINED3DTS_PROJECTION, (struct wined3d_matrix *)&projection);
WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection);
if (SUCCEEDED(hr))
This->legacy_projection = *matrix;
wined3d_mutex_unlock();
......@@ -3343,11 +3352,20 @@ IDirect3DDeviceImpl_7_GetTransform(IDirect3DDevice7 *iface,
switch(TransformStateType)
{
case D3DTRANSFORMSTATE_WORLD : type = WINED3DTS_WORLDMATRIX(0); break;
case D3DTRANSFORMSTATE_WORLD1: type = WINED3DTS_WORLDMATRIX(1); break;
case D3DTRANSFORMSTATE_WORLD2: type = WINED3DTS_WORLDMATRIX(2); break;
case D3DTRANSFORMSTATE_WORLD3: type = WINED3DTS_WORLDMATRIX(3); break;
default: type = TransformStateType;
case D3DTRANSFORMSTATE_WORLD:
type = WINED3D_TS_WORLD_MATRIX(0);
break;
case D3DTRANSFORMSTATE_WORLD1:
type = WINED3D_TS_WORLD_MATRIX(1);
break;
case D3DTRANSFORMSTATE_WORLD2:
type = WINED3D_TS_WORLD_MATRIX(2);
break;
case D3DTRANSFORMSTATE_WORLD3:
type = WINED3D_TS_WORLD_MATRIX(3);
break;
default:
type = TransformStateType;
}
if(!Matrix)
......@@ -3446,11 +3464,20 @@ IDirect3DDeviceImpl_7_MultiplyTransform(IDirect3DDevice7 *iface,
switch(TransformStateType)
{
case D3DTRANSFORMSTATE_WORLD : type = WINED3DTS_WORLDMATRIX(0); break;
case D3DTRANSFORMSTATE_WORLD1: type = WINED3DTS_WORLDMATRIX(1); break;
case D3DTRANSFORMSTATE_WORLD2: type = WINED3DTS_WORLDMATRIX(2); break;
case D3DTRANSFORMSTATE_WORLD3: type = WINED3DTS_WORLDMATRIX(3); break;
default: type = TransformStateType;
case D3DTRANSFORMSTATE_WORLD:
type = WINED3D_TS_WORLD_MATRIX(0);
break;
case D3DTRANSFORMSTATE_WORLD1:
type = WINED3D_TS_WORLD_MATRIX(1);
break;
case D3DTRANSFORMSTATE_WORLD2:
type = WINED3D_TS_WORLD_MATRIX(2);
break;
case D3DTRANSFORMSTATE_WORLD3:
type = WINED3D_TS_WORLD_MATRIX(3);
break;
default:
type = TransformStateType;
}
/* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
......@@ -3501,7 +3528,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_MultiplyTransform(IDirect3DDevice3 *
multiply_matrix(&tmp, &This->legacy_projection, matrix);
multiply_matrix(&projection, &This->legacy_clipspace, &tmp);
hr = wined3d_device_set_transform(This->wined3d_device,
WINED3DTS_PROJECTION, (struct wined3d_matrix *)&projection);
WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection);
if (SUCCEEDED(hr))
This->legacy_projection = tmp;
wined3d_mutex_unlock();
......
dlls/ddraw/executebuffer.c
View file @ f38e94af
......@@ -320,7 +320,7 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This,
wined3d_device_get_transform(lpDevice->wined3d_device,
D3DTRANSFORMSTATE_PROJECTION, (struct wined3d_matrix *)&proj_mat);
wined3d_device_get_transform(lpDevice->wined3d_device,
WINED3DTS_WORLDMATRIX(0), (struct wined3d_matrix *)&world_mat);
WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)&world_mat);
for (i = 0; i < count; i++) {
LPD3DPROCESSVERTICES ci = (LPD3DPROCESSVERTICES) instr;
......
dlls/ddraw/viewport.c
View file @ f38e94af
......@@ -45,7 +45,7 @@ static void update_clip_space(IDirect3DDeviceImpl *device,
multiply_matrix(&projection, &clip_space, &device->legacy_projection);
hr = wined3d_device_set_transform(device->wined3d_device,
WINED3DTS_PROJECTION, (struct wined3d_matrix *)&projection);
WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection);
if (SUCCEEDED(hr))
device->legacy_clipspace = clip_space;
}
......@@ -434,7 +434,7 @@ IDirect3DViewportImpl_TransformVertices(IDirect3DViewport3 *iface,
wined3d_device_get_transform(This->active_device->wined3d_device,
D3DTRANSFORMSTATE_VIEW, (struct wined3d_matrix *)&view_mat);
wined3d_device_get_transform(This->active_device->wined3d_device,
WINED3DTS_WORLDMATRIX(0), (struct wined3d_matrix *)&world_mat);
WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)&world_mat);
multiply_matrix(&mat, &view_mat, &world_mat);
multiply_matrix(&mat, &This->active_device->legacy_projection, &mat);
......
dlls/wined3d/context.c
View file @ f38e94af
......@@ -1771,7 +1771,7 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con
{
if (sampler < MAX_TEXTURES)
{
context_invalidate_state(context, STATE_TRANSFORM(WINED3DTS_TEXTURE0 + sampler));
context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_TEXTURE0 + sampler));
context_invalidate_state(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP));
}
context_invalidate_state(context, STATE_SAMPLER(sampler));
......@@ -1826,7 +1826,7 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con
checkGLcall("glMatrixMode(GL_MODELVIEW)");
glLoadIdentity();
checkGLcall("glLoadIdentity()");
context_invalidate_state(context, STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(0)));
context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0)));
context->last_was_rhw = TRUE;
context_invalidate_state(context, STATE_VDECL); /* because of last_was_rhw = TRUE */
......@@ -1846,7 +1846,7 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con
context->blit_w = width; context->blit_h = height;
context_invalidate_state(context, STATE_VIEWPORT);
context_invalidate_state(context, STATE_TRANSFORM(WINED3DTS_PROJECTION));
context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION));
}
static inline BOOL is_rt_mask_onscreen(DWORD rt_mask)
......@@ -1980,7 +1980,7 @@ static void context_set_render_offscreen(struct wined3d_context *context, BOOL o
if (context->render_offscreen == offscreen) return;
context_invalidate_state(context, STATE_POINTSPRITECOORDORIGIN);
context_invalidate_state(context, STATE_TRANSFORM(WINED3DTS_PROJECTION));
context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION));
context_invalidate_state(context, STATE_VIEWPORT);
context_invalidate_state(context, STATE_SCISSORRECT);
context_invalidate_state(context, STATE_FRONTFACE);
......
dlls/wined3d/device.c
View file @ f38e94af
......@@ -1798,7 +1798,7 @@ HRESULT CDECL wined3d_device_get_stream_source_freq(const struct wined3d_device
}
HRESULT CDECL wined3d_device_set_transform(struct wined3d_device *device,
WINED3DTRANSFORMSTATETYPE d3dts, const struct wined3d_matrix *matrix)
enum wined3d_transform_state d3dts, const struct wined3d_matrix *matrix)
{
TRACE("device %p, state %s, matrix %p.\n",
device, debug_d3dtstype(d3dts), matrix);
......@@ -1832,10 +1832,10 @@ HRESULT CDECL wined3d_device_set_transform(struct wined3d_device *device,
* In OpenGL, camera and world space is combined into GL_MODELVIEW
* matrix. The Projection matrix stay projection matrix. */
if (d3dts == WINED3DTS_VIEW)
if (d3dts == WINED3D_TS_VIEW)
device->view_ident = !memcmp(matrix, identity, 16 * sizeof(float));
if (d3dts < WINED3DTS_WORLDMATRIX(device->adapter->gl_info.limits.blends))
if (d3dts < WINED3D_TS_WORLD_MATRIX(device->adapter->gl_info.limits.blends))
device_invalidate_state(device, STATE_TRANSFORM(d3dts));
return WINED3D_OK;
......@@ -1843,7 +1843,7 @@ HRESULT CDECL wined3d_device_set_transform(struct wined3d_device *device,
}
HRESULT CDECL wined3d_device_get_transform(const struct wined3d_device *device,
WINED3DTRANSFORMSTATETYPE state, struct wined3d_matrix *matrix)
enum wined3d_transform_state state, struct wined3d_matrix *matrix)
{
TRACE("device %p, state %s, matrix %p.\n", device, debug_d3dtstype(state), matrix);
......@@ -1853,7 +1853,7 @@ HRESULT CDECL wined3d_device_get_transform(const struct wined3d_device *device,
}
HRESULT CDECL wined3d_device_multiply_transform(struct wined3d_device *device,
WINED3DTRANSFORMSTATETYPE state, const struct wined3d_matrix *matrix)
enum wined3d_transform_state state, const struct wined3d_matrix *matrix)
{
const struct wined3d_matrix *mat = NULL;
struct wined3d_matrix temp;
......@@ -3249,9 +3249,9 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO
} else doClip = FALSE;
dest_ptr = ((char *)buffer_get_sysmem(dest, gl_info)) + dwDestIndex * get_flexible_vertex_size(DestFVF);
wined3d_device_get_transform(device, WINED3DTS_VIEW, &view_mat);
wined3d_device_get_transform(device, WINED3DTS_PROJECTION, &proj_mat);
wined3d_device_get_transform(device, WINED3DTS_WORLDMATRIX(0), &world_mat);
wined3d_device_get_transform(device, WINED3D_TS_VIEW, &view_mat);
wined3d_device_get_transform(device, WINED3D_TS_PROJECTION, &proj_mat);
wined3d_device_get_transform(device, WINED3D_TS_WORLD_MATRIX(0), &world_mat);
TRACE("View mat:\n");
TRACE("%f %f %f %f\n", view_mat.u.s._11, view_mat.u.s._12, view_mat.u.s._13, view_mat.u.s._14);
......
dlls/wined3d/stateblock.c
View file @ f38e94af
......@@ -723,7 +723,7 @@ HRESULT CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock)
/* Others + Render & Texture */
for (i = 0; i < stateblock->num_contained_transform_states; ++i)
{
WINED3DTRANSFORMSTATETYPE transform = stateblock->contained_transform_states[i];
enum wined3d_transform_state transform = stateblock->contained_transform_states[i];
TRACE("Updating transform %#x.\n", transform);
......@@ -1108,11 +1108,11 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock)
stateblock->blockType = WINED3DSBT_INIT;
/* Set some of the defaults for lights, transforms etc */
memcpy(&state->transforms[WINED3DTS_PROJECTION], identity, sizeof(identity));
memcpy(&state->transforms[WINED3DTS_VIEW], identity, sizeof(identity));
memcpy(&state->transforms[WINED3D_TS_PROJECTION], identity, sizeof(identity));
memcpy(&state->transforms[WINED3D_TS_VIEW], identity, sizeof(identity));
for (i = 0; i < 256; ++i)
{
memcpy(&state->transforms[WINED3DTS_WORLDMATRIX(i)], identity, sizeof(identity));
memcpy(&state->transforms[WINED3D_TS_WORLD_MATRIX(i)], identity, sizeof(identity));
}
state->fb = &device->fb;
......@@ -1253,7 +1253,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock)
for (i = 0; i < MAX_TEXTURES; ++i)
{
TRACE("Setting up default texture states for texture Stage %u.\n", i);
memcpy(&state->transforms[WINED3DTS_TEXTURE0 + i], identity, sizeof(identity));
memcpy(&state->transforms[WINED3D_TS_TEXTURE0 + i], identity, sizeof(identity));
state->texture_states[i][WINED3D_TSS_COLOR_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_MODULATE;
state->texture_states[i][WINED3D_TSS_COLOR_ARG1] = WINED3DTA_TEXTURE;
state->texture_states[i][WINED3D_TSS_COLOR_ARG2] = WINED3DTA_CURRENT;
......
dlls/wined3d/utils.c
View file @ f38e94af
......@@ -2265,27 +2265,30 @@ const char *debug_d3dtop(enum wined3d_texture_op d3dtop)
}
}
const char* debug_d3dtstype(WINED3DTRANSFORMSTATETYPE tstype) {
switch (tstype) {
const char *debug_d3dtstype(enum wined3d_transform_state tstype)
{
switch (tstype)
{
#define TSTYPE_TO_STR(tstype) case tstype: return #tstype
TSTYPE_TO_STR(WINED3DTS_VIEW);
TSTYPE_TO_STR(WINED3DTS_PROJECTION);
TSTYPE_TO_STR(WINED3DTS_TEXTURE0);
TSTYPE_TO_STR(WINED3DTS_TEXTURE1);
TSTYPE_TO_STR(WINED3DTS_TEXTURE2);
TSTYPE_TO_STR(WINED3DTS_TEXTURE3);
TSTYPE_TO_STR(WINED3DTS_TEXTURE4);
TSTYPE_TO_STR(WINED3DTS_TEXTURE5);
TSTYPE_TO_STR(WINED3DTS_TEXTURE6);
TSTYPE_TO_STR(WINED3DTS_TEXTURE7);
TSTYPE_TO_STR(WINED3DTS_WORLDMATRIX(0));
TSTYPE_TO_STR(WINED3D_TS_VIEW);
TSTYPE_TO_STR(WINED3D_TS_PROJECTION);
TSTYPE_TO_STR(WINED3D_TS_TEXTURE0);
TSTYPE_TO_STR(WINED3D_TS_TEXTURE1);
TSTYPE_TO_STR(WINED3D_TS_TEXTURE2);
TSTYPE_TO_STR(WINED3D_TS_TEXTURE3);
TSTYPE_TO_STR(WINED3D_TS_TEXTURE4);
TSTYPE_TO_STR(WINED3D_TS_TEXTURE5);
TSTYPE_TO_STR(WINED3D_TS_TEXTURE6);
TSTYPE_TO_STR(WINED3D_TS_TEXTURE7);
TSTYPE_TO_STR(WINED3D_TS_WORLD_MATRIX(0));
#undef TSTYPE_TO_STR
default:
if (tstype > 256 && tstype < 512) {
FIXME("WINED3DTS_WORLDMATRIX(%u). 1..255 not currently supported\n", tstype);
return ("WINED3DTS_WORLDMATRIX > 0");
if (tstype > 256 && tstype < 512)
{
FIXME("WINED3D_TS_WORLD_MATRIX(%u). 1..255 not currently supported.\n", tstype);
return ("WINED3D_TS_WORLD_MATRIX > 0");
}
FIXME("Unrecognized %u WINED3DTS\n", tstype);
FIXME("Unrecognized transform state %#x.\n", tstype);
return "unrecognized";
}
}
......
dlls/wined3d/wined3d_private.h
View file @ f38e94af
......@@ -817,7 +817,7 @@ extern int num_lock DECLSPEC_HIDDEN;
(vec)[3] = D3DCOLOR_A(dw); \
} while(0)
#define HIGHEST_TRANSFORMSTATE WINED3DTS_WORLDMATRIX(255) /* Highest value in WINED3DTRANSFORMSTATETYPE */
#define HIGHEST_TRANSFORMSTATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */
/* Checking of API calls */
/* --------------------- */
......@@ -964,9 +964,9 @@ extern glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT] DECLSPEC
#define STATE_IS_PIXELSHADER(a) ((a) == STATE_PIXELSHADER)
#define STATE_TRANSFORM(a) (STATE_PIXELSHADER + (a))
#define STATE_IS_TRANSFORM(a) ((a) >= STATE_TRANSFORM(1) && (a) <= STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)))
#define STATE_IS_TRANSFORM(a) ((a) >= STATE_TRANSFORM(1) && (a) <= STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(255)))
#define STATE_STREAMSRC (STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)) + 1)
#define STATE_STREAMSRC (STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(255)) + 1)
#define STATE_IS_STREAMSRC(a) ((a) == STATE_STREAMSRC)
#define STATE_INDEXBUFFER (STATE_STREAMSRC + 1)
#define STATE_IS_INDEXBUFFER(a) ((a) == STATE_INDEXBUFFER)
......@@ -2504,7 +2504,7 @@ const char *debug_d3dsamplerstate(enum wined3d_sampler_state state) DECLSPEC_HID
const char *debug_d3dstate(DWORD state) DECLSPEC_HIDDEN;
const char *debug_d3dtexturefiltertype(WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN;
const char *debug_d3dtexturestate(enum wined3d_texture_stage_state state) DECLSPEC_HIDDEN;
const char *debug_d3dtstype(WINED3DTRANSFORMSTATETYPE tstype) DECLSPEC_HIDDEN;
const char *debug_d3dtstype(enum wined3d_transform_state tstype) DECLSPEC_HIDDEN;
const char *debug_d3dpool(WINED3DPOOL pool) DECLSPEC_HIDDEN;
const char *debug_fbostatus(GLenum status) DECLSPEC_HIDDEN;
const char *debug_glerror(GLenum error) DECLSPEC_HIDDEN;
......
include/wine/wined3d.h
View file @ f38e94af
......@@ -621,26 +621,25 @@ enum wined3d_texture_address
WINED3D_TADDRESS_MIRROR_ONCE = 5,
};
typedef enum _WINED3DTRANSFORMSTATETYPE
{
WINED3DTS_VIEW = 2,
WINED3DTS_PROJECTION = 3,
WINED3DTS_TEXTURE0 = 16,
WINED3DTS_TEXTURE1 = 17,
WINED3DTS_TEXTURE2 = 18,
WINED3DTS_TEXTURE3 = 19,
WINED3DTS_TEXTURE4 = 20,
WINED3DTS_TEXTURE5 = 21,
WINED3DTS_TEXTURE6 = 22,
WINED3DTS_TEXTURE7 = 23,
WINED3DTS_WORLD = 256, /*WINED3DTS_WORLDMATRIX(0)*/
WINED3DTS_WORLD1 = 257,
WINED3DTS_WORLD2 = 258,
WINED3DTS_WORLD3 = 259,
WINED3DTS_FORCE_DWORD = 0x7fffffff
} WINED3DTRANSFORMSTATETYPE;
#define WINED3DTS_WORLDMATRIX(index) (WINED3DTRANSFORMSTATETYPE)(index + 256)
enum wined3d_transform_state
{
WINED3D_TS_VIEW = 2,
WINED3D_TS_PROJECTION = 3,
WINED3D_TS_TEXTURE0 = 16,
WINED3D_TS_TEXTURE1 = 17,
WINED3D_TS_TEXTURE2 = 18,
WINED3D_TS_TEXTURE3 = 19,
WINED3D_TS_TEXTURE4 = 20,
WINED3D_TS_TEXTURE5 = 21,
WINED3D_TS_TEXTURE6 = 22,
WINED3D_TS_TEXTURE7 = 23,
WINED3D_TS_WORLD = 256, /* WINED3D_TS_WORLD_MATRIX(0) */
WINED3D_TS_WORLD1 = 257,
WINED3D_TS_WORLD2 = 258,
WINED3D_TS_WORLD3 = 259,
};
#define WINED3D_TS_WORLD_MATRIX(index) (enum wined3d_transform_state)(index + 256)
typedef enum _WINED3DBASISTYPE
{
......@@ -2148,7 +2147,7 @@ HRESULT __cdecl wined3d_device_get_texture(const struct wined3d_device *device,
HRESULT __cdecl wined3d_device_get_texture_stage_state(const struct wined3d_device *device,
UINT stage, enum wined3d_texture_stage_state state, DWORD *value);
HRESULT __cdecl wined3d_device_get_transform(const struct wined3d_device *device,
WINED3DTRANSFORMSTATETYPE state, struct wined3d_matrix *matrix);
enum wined3d_transform_state state, struct wined3d_matrix *matrix);
HRESULT __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device,
struct wined3d_vertex_declaration **declaration);
struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device);
......@@ -2164,7 +2163,7 @@ ULONG __cdecl wined3d_device_incref(struct wined3d_device *device);
HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc);
HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc);
HRESULT __cdecl wined3d_device_multiply_transform(struct wined3d_device *device,
WINED3DTRANSFORMSTATETYPE state, const struct wined3d_matrix *matrix);
enum wined3d_transform_state state, const struct wined3d_matrix *matrix);
HRESULT __cdecl wined3d_device_present(const struct wined3d_device *device, const RECT *src_rect,
const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region);
HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device,
......@@ -2220,7 +2219,7 @@ HRESULT __cdecl wined3d_device_set_texture(struct wined3d_device *device, UINT s
HRESULT __cdecl wined3d_device_set_texture_stage_state(struct wined3d_device *device,
UINT stage, enum wined3d_texture_stage_state state, DWORD value);
HRESULT __cdecl wined3d_device_set_transform(struct wined3d_device *device,
WINED3DTRANSFORMSTATETYPE state, const struct wined3d_matrix *matrix);
enum wined3d_transform_state state, const struct wined3d_matrix *matrix);
HRESULT __cdecl wined3d_device_set_vertex_declaration(struct wined3d_device *device,
struct wined3d_vertex_declaration *declaration);
HRESULT __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader);
......
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