From fa46a2bf19e26da5fd6e7b0b97408ee73ee3ed09 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 12 Sep 2014 00:00:20 +0200 Subject: [PATCH] (D3D) d3d_wrapper.c build fixes --- gfx/d3d9/d3d_wrapper.c | 21 ++++++++++----------- gfx/d3d9/d3d_wrapper.h | 8 ++++---- gfx/image/image_xdk1.c | 6 +++--- griffin/griffin.c | 1 + 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gfx/d3d9/d3d_wrapper.c b/gfx/d3d9/d3d_wrapper.c index 48349338e3..b7fb0ab714 100644 --- a/gfx/d3d9/d3d_wrapper.c +++ b/gfx/d3d9/d3d_wrapper.c @@ -14,7 +14,6 @@ * If not, see . */ -#include "../context/win32_common.h" #include "d3d_wrapper.h" void d3d_swap(d3d_video_t *d3d, LPDIRECT3DDEVICE dev) @@ -34,7 +33,7 @@ void d3d_swap(d3d_video_t *d3d, LPDIRECT3DDEVICE dev) HRESULT d3d_create_vertex_buffer(LPDIRECT3DDEVICE dev, unsigned length, unsigned usage, unsigned fvf, - d3DPOOL pool, LPDIRECT3DVERTEXBUFFER vert_buf, void *handle) + D3DPOOL pool, LPDIRECT3DVERTEXBUFFER vert_buf, void *handle) { #if defined(_XBOX1) IDirect3DDevice8_CreateVertexBuffer(dev, length, usage, fvf, pool, @@ -101,7 +100,7 @@ void d3d_set_sampler_minfilter(LPDIRECT3DDEVICE dev, } void d3d_set_sampler_magfilter(LPDIRECT3DDEVICE dev, - unsigned sampler, unsigned type) + unsigned sampler, unsigned type, unsigned value) { #if defined(_XBOX1) D3D__DirtyFlags |= (D3DDIRTYFLAG_TEXTURE_STATE_0 << sampler); @@ -114,7 +113,7 @@ void d3d_set_sampler_magfilter(LPDIRECT3DDEVICE dev, } void d3d_draw_primitive(LPDIRECT3DDEVICE dev, - unsigned type, unsigned start, unsigned count) + D3DPRIMITIVETYPE type, unsigned start, unsigned count) { #if defined(_XBOX1) D3DDevice_DrawVertices(type, start, D3DVERTEXCOUNT(type, count)); @@ -135,12 +134,12 @@ void d3d_lockrectangle_clear(LPDIRECT3DTEXTURE tex, unsigned flags) { #if defined(_XBOX) - D3DTexture_LockRect(tex, level, &lockedrect, rect, flags); - memset(lockedrect.pBits, 0, tex_height * lockedrect.Pitch) + D3DTexture_LockRect(tex, level, &lock_rect, &rect, flags); + memset(lock_rect.pBits, 0, tex_height * lock_rect.Pitch); #else - if (SUCCEEDED(tex->LockRect(level, &lockedrect, rect, flags))) + if (SUCCEEDED(tex->LockRect(level, &lock_rect, rect, flags))) { - memset(lockedrect.pBits, level, tex_height * lockedrect.Pitch); + memset(lock_rect.pBits, level, tex_height * lock_rect.Pitch); tex->UnlockRect(0); } #endif @@ -148,16 +147,16 @@ void d3d_lockrectangle_clear(LPDIRECT3DTEXTURE tex, void d3d_textureblit(d3d_video_t *d3d, LPDIRECT3DTEXTURE tex, D3DSURFACE_DESC desc, - D3DLOCKED_RECT rect, const void *frame, + D3DLOCKED_RECT lr, const void *frame, unsigned width, unsigned height, unsigned pitch) { #if 1 - if (SUCCEEDED(tex->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK))) + if (SUCCEEDED(tex->LockRect(0, &lr, NULL, D3DLOCK_NOSYSLOCK))) { for (unsigned y = 0; y < height; y++) { const uint8_t *in = (const uint8_t*)frame + y * pitch; - uint8_t *out = (uint8_t*)d3dlr.pBits + y * d3dlr.Pitch; + uint8_t *out = (uint8_t*)lr.pBits + y * lr.Pitch; memcpy(out, in, width * d3d->pixel_size); } tex->UnlockRect(0); diff --git a/gfx/d3d9/d3d_wrapper.h b/gfx/d3d9/d3d_wrapper.h index b75846a03f..ce4ed80abb 100644 --- a/gfx/d3d9/d3d_wrapper.h +++ b/gfx/d3d9/d3d_wrapper.h @@ -24,7 +24,7 @@ void d3d_swap(d3d_video_t *d3d, LPDIRECT3DDEVICE dev); HRESULT d3d_create_vertex_buffer(LPDIRECT3DDEVICE dev, unsigned length, unsigned usage, unsigned fvf, - d3DPOOL pool, LPDIRECT3DVERTEXBUFFER vert_buf, void *handle); + D3DPOOL pool, LPDIRECT3DVERTEXBUFFER vert_buf, void *handle); void d3d_set_stream_source(LPDIRECT3DDEVICE dev, unsigned stream_no, LPDIRECT3DVERTEXBUFFER stream_vertbuf, unsigned offset_bytes, @@ -40,10 +40,10 @@ void d3d_set_sampler_minfilter(LPDIRECT3DDEVICE dev, unsigned sampler, unsigned type, unsigned value); void d3d_set_sampler_magfilter(LPDIRECT3DDEVICE dev, - unsigned sampler, unsigned type); + unsigned sampler, unsigned type, unsigned value); void d3d_draw_primitive(LPDIRECT3DDEVICE dev, - unsigned type, unsigned start, unsigned count); + D3DPRIMITIVETYPE type, unsigned start, unsigned count); void d3d_lockrectangle_clear(LPDIRECT3DTEXTURE tex, unsigned tex_width, unsigned tex_height, @@ -52,7 +52,7 @@ void d3d_lockrectangle_clear(LPDIRECT3DTEXTURE tex, void d3d_textureblit(d3d_video_t *d3d, LPDIRECT3DTEXTURE tex, D3DSURFACE_DESC desc, - D3DLOCKED_RECT rect, const void *frame, + D3DLOCKED_RECT lr, const void *frame, unsigned width, unsigned height, unsigned pitch); #endif diff --git a/gfx/image/image_xdk1.c b/gfx/image/image_xdk1.c index d44e1923dc..b667a0ef66 100644 --- a/gfx/image/image_xdk1.c +++ b/gfx/image/image_xdk1.c @@ -15,7 +15,7 @@ */ #include "image.h" -#include "../d3d9/d3d_defines.h" +#include "../d3d9/d3d_wrapper.h" bool texture_image_load(struct texture_image *out_img, const char *path) { @@ -36,9 +36,9 @@ bool texture_image_load(struct texture_image *out_img, const char *path) } /* create a vertex buffer for the quad that will display the texture */ - if (FAILED(D3DDevice_CreateVertexBuffers(d3d->dev, 4 * sizeof(Vertex), + if (FAILED(d3d_create_vertex_buffer(d3d->dev, 4 * sizeof(Vertex), D3DUSAGE_WRITEONLY, D3DFVF_CUSTOMVERTEX, - D3DPOOL_MANAGED, &out_img->vertex_buf, NULL))) + D3DPOOL_MANAGED, out_img->vertex_buf, NULL))) { RARCH_ERR("Error occurred during CreateVertexBuffer().\n"); out_img->pixels->Release(); diff --git a/griffin/griffin.c b/griffin/griffin.c index b286ab5fe6..5a6cc3560c 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -219,6 +219,7 @@ VIDEO DRIVER #endif #ifdef _XBOX +#include "../gfx/d3d9/d3d_wrapper.c" #include "../gfx/d3d9/d3d.cpp" #endif