mirror of
https://github.com/CTCaer/RetroArch.git
synced 2024-12-23 11:18:25 +00:00
(MSVC 2003) Fixes
This commit is contained in:
parent
8617b9f649
commit
4791174ea3
@ -693,6 +693,7 @@ static void *gl_glsl_init(void *data, const char *path)
|
||||
{
|
||||
unsigned i;
|
||||
struct shader_program_info shader_prog_info;
|
||||
bool shader_support = false;
|
||||
config_file_t *conf = NULL;
|
||||
const char *stock_vertex = NULL;
|
||||
const char *stock_fragment = NULL;
|
||||
@ -702,9 +703,11 @@ static void *gl_glsl_init(void *data, const char *path)
|
||||
if (!glsl)
|
||||
return NULL;
|
||||
|
||||
(void)shader_support;
|
||||
|
||||
#ifndef HAVE_OPENGLES
|
||||
RARCH_LOG("Checking GLSL shader support ...\n");
|
||||
bool shader_support = glCreateProgram && glUseProgram && glCreateShader
|
||||
shader_support = glCreateProgram && glUseProgram && glCreateShader
|
||||
&& glDeleteShader && glShaderSource && glCompileShader && glAttachShader
|
||||
&& glDetachShader && glLinkProgram && glGetUniformLocation
|
||||
&& glUniform1i && glUniform1f && glUniform2fv && glUniform4fv
|
||||
|
@ -403,14 +403,14 @@ static struct video_shader_parameter *video_shader_parse_find_parameter(
|
||||
bool video_shader_resolve_current_parameters(config_file_t *conf,
|
||||
struct video_shader *shader)
|
||||
{
|
||||
if (!conf)
|
||||
return false;
|
||||
|
||||
/* Read in parameters which override the defaults. */
|
||||
char parameters[4096] = {0};
|
||||
const char *id = NULL;
|
||||
char *save = NULL;
|
||||
|
||||
if (!conf)
|
||||
return false;
|
||||
|
||||
/* Read in parameters which override the defaults. */
|
||||
if (!config_get_array(conf, "parameters",
|
||||
parameters, sizeof(parameters)))
|
||||
return true;
|
||||
|
@ -35,7 +35,7 @@ int c99_vsnprintf_retro__(char *outBuf, size_t size, const char *format, va_list
|
||||
|
||||
if (size != 0)
|
||||
#if (_MSC_VER <= 1310)
|
||||
count = _vsnprintf(outBuf, _TRUNCATE, format, ap);
|
||||
count = _vsnprintf(outBuf, size, format, ap);
|
||||
#else
|
||||
count = _vsnprintf_s(outBuf, size, _TRUNCATE, format, ap);
|
||||
#endif
|
||||
|
@ -36,7 +36,6 @@
|
||||
|
||||
#if defined(_WIN32) && !defined(_XBOX)
|
||||
#include <windows.h>
|
||||
#include <intrin.h>
|
||||
#endif
|
||||
|
||||
#if defined(__CELLOS_LV2__)
|
||||
@ -216,8 +215,10 @@ retro_time_t cpu_features_get_time_usec(void)
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER) && !defined(_XBOX)
|
||||
#if (_MSC_VER > 1310)
|
||||
#include <intrin.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(CPU_X86) && !defined(__MACH__)
|
||||
void x86_cpuid(int func, int flags[4])
|
||||
|
Loading…
Reference in New Issue
Block a user