mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-01 20:54:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(MSVC 2003) Fixes

Browse Source
This commit is contained in:
twinaphex 2006-01-17 06:11:55 +01:00
parent 8617b9f649
commit 4791174ea3
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/drivers_shader/shader_glsl.c
View File

@ -693,6 +693,7 @@ static void *gl_glsl_init(void *data, const char *path)
{ {
unsigned i; unsigned i;
struct shader_program_info shader_prog_info; struct shader_program_info shader_prog_info;
bool shader_support = false;
config_file_t *conf = NULL; config_file_t *conf = NULL;
const char *stock_vertex = NULL; const char *stock_vertex = NULL;
const char *stock_fragment = NULL; const char *stock_fragment = NULL;
@ -702,9 +703,11 @@ static void *gl_glsl_init(void *data, const char *path)
if (!glsl) if (!glsl)
return NULL; return NULL;
(void)shader_support;
#ifndef HAVE_OPENGLES #ifndef HAVE_OPENGLES
RARCH_LOG("Checking GLSL shader support ...\n"); RARCH_LOG("Checking GLSL shader support ...\n");
bool shader_support = glCreateProgram && glUseProgram && glCreateShader shader_support = glCreateProgram && glUseProgram && glCreateShader
&& glDeleteShader && glShaderSource && glCompileShader && glAttachShader && glDeleteShader && glShaderSource && glCompileShader && glAttachShader
&& glDetachShader && glLinkProgram && glGetUniformLocation && glDetachShader && glLinkProgram && glGetUniformLocation
&& glUniform1i && glUniform1f && glUniform2fv && glUniform4fv && glUniform1i && glUniform1f && glUniform2fv && glUniform4fv

8
gfx/video_shader_parse.c
View File

@ -403,14 +403,14 @@ static struct video_shader_parameter *video_shader_parse_find_parameter(
bool video_shader_resolve_current_parameters(config_file_t *conf, bool video_shader_resolve_current_parameters(config_file_t *conf,
struct video_shader *shader) struct video_shader *shader)
{ {
if (!conf)
return false;
/* Read in parameters which override the defaults. */
char parameters[4096] = {0}; char parameters[4096] = {0};
const char *id = NULL; const char *id = NULL;
char *save = NULL; char *save = NULL;
if (!conf)
return false;
/* Read in parameters which override the defaults. */
if (!config_get_array(conf, "parameters", if (!config_get_array(conf, "parameters",
parameters, sizeof(parameters))) parameters, sizeof(parameters)))
return true; return true;

2
libretro-common/compat/compat_snprintf.c
View File

@ -35,7 +35,7 @@ int c99_vsnprintf_retro__(char *outBuf, size_t size, const char *format, va_list
if (size != 0) if (size != 0)
#if (_MSC_VER <= 1310) #if (_MSC_VER <= 1310)
count = _vsnprintf(outBuf, _TRUNCATE, format, ap); count = _vsnprintf(outBuf, size, format, ap);
#else #else
count = _vsnprintf_s(outBuf, size, _TRUNCATE, format, ap); count = _vsnprintf_s(outBuf, size, _TRUNCATE, format, ap);
#endif #endif

3
libretro-common/features/features_cpu.c
View File

@ -36,7 +36,6 @@
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32) && !defined(_XBOX)
#include <windows.h> #include <windows.h>
#include <intrin.h>
#endif #endif
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
@ -216,8 +215,10 @@ retro_time_t cpu_features_get_time_usec(void)
#endif #endif
#if defined(_MSC_VER) && !defined(_XBOX) #if defined(_MSC_VER) && !defined(_XBOX)
#if (_MSC_VER > 1310)
#include <intrin.h> #include <intrin.h>
#endif #endif
#endif
#if defined(CPU_X86) && !defined(__MACH__) #if defined(CPU_X86) && !defined(__MACH__)
void x86_cpuid(int func, int flags[4]) void x86_cpuid(int func, int flags[4])