(D3D) Build fixes
This commit is contained in:
parent
ece77e4bfa
commit
02c514a873
|
@ -103,6 +103,7 @@ static HMONITOR monitor_all[MAX_MONITORS];
|
||||||
static unsigned monitor_count;
|
static unsigned monitor_count;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
|
||||||
static void d3d_deinit_shader(void *data)
|
static void d3d_deinit_shader(void *data)
|
||||||
{
|
{
|
||||||
d3d_video_t *d3d = (d3d_video_t*)data;
|
d3d_video_t *d3d = (d3d_video_t*)data;
|
||||||
|
@ -153,10 +154,11 @@ static bool d3d_init_shader(void *data)
|
||||||
if (FAILED(ret))
|
if (FAILED(ret))
|
||||||
return false;
|
return false;
|
||||||
return true;
|
return true;
|
||||||
#elif defined(_XBOX1)
|
#else
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static void d3d_deinit_chain(d3d_video_t *d3d)
|
static void d3d_deinit_chain(d3d_video_t *d3d)
|
||||||
{
|
{
|
||||||
|
@ -1013,7 +1015,12 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (!renderchain_init(d3d->chain, &d3d->video_info, d3dr,
|
if (!renderchain_init(d3d->chain, &d3d->video_info, d3dr,
|
||||||
d3d->cgCtx, &d3d->final_viewport, &link_info,
|
#ifdef HAVE_CG
|
||||||
|
d3d->cgCtx,
|
||||||
|
#else
|
||||||
|
NULL,
|
||||||
|
#endif
|
||||||
|
&d3d->final_viewport, &link_info,
|
||||||
d3d->video_info.rgb32 ? ARGB : RGB565))
|
d3d->video_info.rgb32 ? ARGB : RGB565))
|
||||||
{
|
{
|
||||||
RARCH_ERR("[D3D9]: Failed to init render chain.\n");
|
RARCH_ERR("[D3D9]: Failed to init render chain.\n");
|
||||||
|
|
|
@ -50,6 +50,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../font_driver.h"
|
#include "../font_driver.h"
|
||||||
|
#include "../font_renderer_driver.h"
|
||||||
#include "../video_context_driver.h"
|
#include "../video_context_driver.h"
|
||||||
|
|
||||||
#ifdef HAVE_CG
|
#ifdef HAVE_CG
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include "d3d.h"
|
#include "d3d.h"
|
||||||
#include "../video_state_tracker.h"
|
#include "../video_state_tracker.h"
|
||||||
#include "../video_shader_parse.h"
|
#include "../video_shader_parse.h"
|
||||||
|
#include "../inc/Cg/cg.h"
|
||||||
|
|
||||||
struct Vertex
|
struct Vertex
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue