From 4791174ea32460d552e4f5d80c8ed256a58969d1 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 17 Jan 2006 06:11:55 +0100 Subject: [PATCH] (MSVC 2003) Fixes --- gfx/drivers_shader/shader_glsl.c | 5 ++++- gfx/video_shader_parse.c | 8 ++++---- libretro-common/compat/compat_snprintf.c | 2 +- libretro-common/features/features_cpu.c | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index 59577f3084..fdc47946e7 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/gfx/drivers_shader/shader_glsl.c @@ -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 diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c index 980d789d42..6209162a95 100644 --- a/gfx/video_shader_parse.c +++ b/gfx/video_shader_parse.c @@ -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; diff --git a/libretro-common/compat/compat_snprintf.c b/libretro-common/compat/compat_snprintf.c index feec9e74b8..336d2b8e7a 100644 --- a/libretro-common/compat/compat_snprintf.c +++ b/libretro-common/compat/compat_snprintf.c @@ -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 diff --git a/libretro-common/features/features_cpu.c b/libretro-common/features/features_cpu.c index e9f93744ed..01ca84b5c9 100644 --- a/libretro-common/features/features_cpu.c +++ b/libretro-common/features/features_cpu.c @@ -36,7 +36,6 @@ #if defined(_WIN32) && !defined(_XBOX) #include -#include #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 #endif +#endif #if defined(CPU_X86) && !defined(__MACH__) void x86_cpuid(int func, int flags[4])