diff --git a/gfx/context/wgl_ctx.c b/gfx/context/wgl_ctx.c index 0a9eac1e8a..e78d312c5b 100644 --- a/gfx/context/wgl_ctx.c +++ b/gfx/context/wgl_ctx.c @@ -213,7 +213,7 @@ extern "C" #endif bool dinput_handle_message(void *dinput, UINT message, WPARAM wParam, LPARAM lParam); -static void *dinput; +static void *dinput_wgl; static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) @@ -263,7 +263,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, } return 0; } - if (dinput_handle_message(dinput, message, wparam, lparam)) + if (dinput_handle_message(dinput_wgl, message, wparam, lparam)) return 0; return DefWindowProc(hwnd, message, wparam, lparam); } @@ -562,7 +562,7 @@ static void gfx_ctx_destroy(void *data) static void gfx_ctx_input_driver(void *data, const input_driver_t **input, void **input_data) { (void)data; - dinput = input_dinput.init(); + dinput_wgl = input_dinput.init(); *input = dinput ? &input_dinput : NULL; *input_data = dinput; } diff --git a/gfx/d3d9/d3d.cpp b/gfx/d3d9/d3d.cpp index afb93d8544..fc8601d96f 100644 --- a/gfx/d3d9/d3d.cpp +++ b/gfx/d3d9/d3d.cpp @@ -755,7 +755,7 @@ static void d3d_free(void *data) #endif #ifdef HAVE_MONITOR -static BOOL CALLBACK monitor_enum_proc(HMONITOR hMonitor, +static BOOL CALLBACK d3d_monitor_enum_proc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData) { Monitor::all_hms[Monitor::num_mons++] = hMonitor; @@ -766,7 +766,7 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hMonitor, static RECT d3d_monitor_rect(d3d_video_t *d3d) { Monitor::num_mons = 0; - EnumDisplayMonitors(NULL, NULL, monitor_enum_proc, 0); + EnumDisplayMonitors(NULL, NULL, d3d_monitor_enum_proc, 0); if (!Monitor::last_hm) Monitor::last_hm = MonitorFromWindow( diff --git a/gfx/shader_glsl.c b/gfx/shader_glsl.c index 260597f19b..496b0e886b 100644 --- a/gfx/shader_glsl.c +++ b/gfx/shader_glsl.c @@ -49,7 +49,7 @@ static unsigned glsl_minor; static bool glsl_enable; static GLuint gl_program[GFX_MAX_SHADERS]; -static unsigned active_index; +static unsigned glsl_active_index; static GLuint gl_teximage[GFX_MAX_TEXTURES]; @@ -643,7 +643,7 @@ static void gl_glsl_deinit(void) memset(gl_program, 0, sizeof(gl_program)); memset(gl_uniforms, 0, sizeof(gl_uniforms)); glsl_enable = false; - active_index = 0; + glsl_active_index = 0; gl_glsl_free_shader(); @@ -874,7 +874,7 @@ static void gl_glsl_set_params(void *data, unsigned width, unsigned height, { (void)data; - if (!glsl_enable || (gl_program[active_index] == 0)) + if (!glsl_enable || (gl_program[glsl_active_index] == 0)) return; GLfloat buffer[512]; @@ -884,7 +884,7 @@ static void gl_glsl_set_params(void *data, unsigned width, unsigned height, size_t attribs_size = 0; struct glsl_attrib *attr = attribs; - const struct shader_uniforms *uni = &gl_uniforms[active_index]; + const struct shader_uniforms *uni = &gl_uniforms[glsl_active_index]; float input_size[2] = {(float)width, (float)height}; float output_size[2] = {(float)out_width, (float)out_height}; @@ -899,9 +899,9 @@ static void gl_glsl_set_params(void *data, unsigned width, unsigned height, if (uni->texture_size >= 0) glUniform2fv(uni->texture_size, 1, texture_size); - if (uni->frame_count >= 0 && active_index) + if (uni->frame_count >= 0 && glsl_active_index) { - unsigned modulo = glsl_shader->pass[active_index - 1].frame_count_mod; + unsigned modulo = glsl_shader->pass[glsl_active_index - 1].frame_count_mod; if (modulo) frame_count %= modulo; glUniform1i(uni->frame_count, frame_count); @@ -925,7 +925,7 @@ static void gl_glsl_set_params(void *data, unsigned width, unsigned height, } /* Set original texture. */ - if (active_index) + if (glsl_active_index) { if (uni->orig.texture >= 0) { @@ -1019,9 +1019,9 @@ static void gl_glsl_set_params(void *data, unsigned width, unsigned height, if (size) { - gl_glsl_set_attribs(glsl_vbo[active_index].vbo_secondary, - &glsl_vbo[active_index].buffer_secondary, - &glsl_vbo[active_index].size_secondary, + gl_glsl_set_attribs(glsl_vbo[glsl_active_index].vbo_secondary, + &glsl_vbo[glsl_active_index].buffer_secondary, + &glsl_vbo[glsl_active_index].size_secondary, buffer, size, attribs, attribs_size); } @@ -1030,7 +1030,7 @@ static void gl_glsl_set_params(void *data, unsigned width, unsigned height, /* #pragma parameters. */ for (i = 0; i < glsl_shader->num_parameters; i++) { - int location = glGetUniformLocation(gl_program[active_index], + int location = glGetUniformLocation(gl_program[glsl_active_index], glsl_shader->parameters[i].id); glUniform1f(location, glsl_shader->parameters[i].current); } @@ -1041,13 +1041,13 @@ static void gl_glsl_set_params(void *data, unsigned width, unsigned height, static struct state_tracker_uniform info[GFX_MAX_VARIABLES]; static unsigned cnt = 0; - if (active_index == 1) + if (glsl_active_index == 1) cnt = state_get_uniform(gl_state_tracker, info, GFX_MAX_VARIABLES, frame_count); for (i = 0; i < cnt; i++) { - int location = glGetUniformLocation(gl_program[active_index], + int location = glGetUniformLocation(gl_program[glsl_active_index], info[i].id); glUniform1f(location, info[i].value); } @@ -1060,7 +1060,7 @@ static bool gl_glsl_set_mvp(void *data, const math_matrix *mat) if (!glsl_enable || !glsl_shader->modern) return false; - int loc = gl_uniforms[active_index].mvp; + int loc = gl_uniforms[glsl_active_index].mvp; if (loc >= 0) glUniformMatrix4fv(loc, 1, GL_FALSE, mat->data); @@ -1088,7 +1088,7 @@ static bool gl_glsl_set_coords(const struct gl_coords *coords) size_t attribs_size = 0; struct glsl_attrib *attr = attribs; - const struct shader_uniforms *uni = &gl_uniforms[active_index]; + const struct shader_uniforms *uni = &gl_uniforms[glsl_active_index]; if (uni->tex_coord >= 0) { attr->loc = uni->tex_coord; @@ -1143,9 +1143,9 @@ static bool gl_glsl_set_coords(const struct gl_coords *coords) if (size) { - gl_glsl_set_attribs(glsl_vbo[active_index].vbo_primary, - &glsl_vbo[active_index].buffer_primary, - &glsl_vbo[active_index].size_primary, + gl_glsl_set_attribs(glsl_vbo[glsl_active_index].vbo_primary, + &glsl_vbo[glsl_active_index].buffer_primary, + &glsl_vbo[glsl_active_index].size_primary, buffer, size, attribs, attribs_size); } @@ -1162,7 +1162,7 @@ static void gl_glsl_use(void *data, unsigned index) { gl_glsl_reset_attrib(); - active_index = index; + glsl_active_index = index; glUseProgram(gl_program[index]); } } diff --git a/griffin/griffin.c b/griffin/griffin.c index cf61ae500d..231a7cd621 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -27,7 +27,7 @@ #define HAVE_COMPRESSION #endif -#if defined(_XBOX) || defined(_MSC_VER) +#if defined(_MSC_VER) #include "../msvc/msvc_compat.h" #endif @@ -85,7 +85,7 @@ COMPATIBILITY /*============================================================ CONFIG FILE ============================================================ */ -#ifdef _XBOX +#if defined(_MSC_VER) #undef __RARCH_POSIX_STRING_H #undef __RARCH_MSVC_COMPAT_H #undef strcasecmp @@ -667,6 +667,10 @@ MENU #endif +#ifdef HAVE_COMMAND +#include "../command.c" +#endif + #ifdef __cplusplus extern "C" { #endif @@ -724,7 +728,7 @@ XML #include "../compat/rxml/rxml.c" #endif /*============================================================ - APPLE EXTENSIONS + SETTINGS ============================================================ */ #include "../settings_data.c" diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj index 205d06af06..71d39667ef 100644 --- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj +++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj @@ -100,7 +100,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;HAVE_CC_RESAMPLER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_COMPRESSION;HAVE_7ZIP + WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;HAVE_CC_RESAMPLER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LAKKA $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -142,7 +142,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;HAVE_CC_RESAMPLER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_COMPRESSION;HAVE_7ZIP + WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;HAVE_CC_RESAMPLER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_GLUI;HAVE_LAKKA $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -184,262 +184,13 @@ $(CG_LIB64_PATH) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CompileAsC - CompileAsC - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + \ No newline at end of file diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters index 5c7b50506f..eb7b12017f 100644 --- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters +++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters @@ -1,554 +1,16 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - gfx - - - gfx - - - gfx - - - frontend\menu - - - frontend\menu\disp - - - gfx\glsym - - - gfx\glsym - - - audio - - - audio - - - audio - - - gfx\math - - - gfx\math - - - gfx - - - gfx - - - gfx - - - gfx - - - gfx\context - - - audio - - - audio - - - audio - - - input - - - input - - - input - - - input - - - audio - - - gfx - - - gfx\rpng - - - input - - - compat - - - frontend - - - frontend - - - gfx\scaler - - - gfx\scaler - - - gfx\scaler - - - gfx\scaler - - - gfx\d3d9 - - - compat\rxml - - - input\autoconf - - - gfx\d3d9 - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - deps\zlib - - - gfx\fonts - - - gfx\fonts - - - gfx\fonts - - - gfx\fonts - - - gfx\fonts - - - gfx\fonts - - - input - - - frontend\menu - - - frontend\menu - - - frontend\menu - - - gfx\context - - - gfx - - - audio - - - frontend\menu\backend - - - gfx - - - frontend\platform - - - gfx\image - - - audio - - - - - - - - - record - - - gfx\context - - - - gfx\d3d9 - - - deps\lzma - - - deps\lzma - - - deps\lzma - - - deps\lzma - - - deps\lzma - - - deps\lzma - - - deps\lzma - - - deps\lzma - - - deps\lzma - - - deps\lzma - - - deps\lzma - - - deps\lzma - - - deps\lzma - - - deps\lzma - - - deps\lzma - - - decompress - - - decompress - - - audio - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - audio - - - audio - - - audio - - - audio - - - compat\rxml - - - frontend - - - frontend - - - frontend\menu - - - frontend\menu - - - frontend\menu - - - frontend\menu - - - frontend\menu\backend - - - frontend\menu\disp - - - gfx - - - gfx - - - gfx - - - gfx - - - gfx - - - gfx - - - gfx - - - gfx - - - gfx - - - gfx\d3d9 - - - gfx\d3d9 - - - gfx\fonts - - - gfx\fonts - - - gfx\fonts - - - gfx\glsym - - - gfx\glsym - - - gfx\image - - - gfx\math - - - gfx\math - - - gfx\rpng - - - gfx\scaler - - - gfx\scaler - - - gfx\scaler - - - gfx\scaler - - - input - - - input - - - input\autoconf - - - input - - - gfx\context - - - record - - - - {8e47cc2f-ec74-4943-b7b7-156705b5d06e} - - - {70d71fcb-ca47-4008-a027-26ed3eaa1f16} - - - {6a00f197-1398-4044-bbf1-ee767df7a2ee} - - - {45fc4432-da59-4c73-a194-1fd2155489bc} - - - {98e75d1b-5c77-4e09-ba68-248974772850} - - - {a4e2c91e-3109-4ef9-a5ae-a42dc713c499} - - - {f2f1e12e-ac10-4b0e-aa95-7a4b6a555d44} - - - {c5041859-b61d-41bb-8f3a-f596248b1132} - - - {46e89489-2413-4645-aef3-66c7d9dd9dca} - - - {c7cbb180-c629-4897-89f0-a4298eaf5f27} - - - {a6b082bc-7b37-4715-8d02-701cc9acae5c} - - - {6489e28b-b1bf-45a3-ab30-4d9a3e68c57b} - - - {21c771b7-6971-4953-83d7-d1f83239d490} - - - {8cc14084-f5b9-4166-81ac-3f66afd6527d} - - - {c2ea7f2b-5a09-4f28-8bbe-a628bd3a0bdd} - - - {a923ed53-ddfb-47d1-a5e7-ec6105c4bd79} - - - {d1a36d53-e5e6-46a5-b5b4-b43794342cd1} - - - {cf7c2fb9-ca3c-468e-af4f-74c652b3e5fe} - - - {dd1ca879-56f4-43f6-8bd8-ae50222061e8} - - - {09d78055-1c93-4f12-ae3e-97aaa90cf78f} - - - {4a5338d9-92ad-4d07-bb1a-97bd6eb475e4} - - - {5a80dd03-b4d7-4118-92ff-55a601fd80fc} - - - {5b5cc9ef-5f96-42bb-9690-d97593954ef1} - - - {fdbc97c0-7581-475f-89ec-40081267f22c} + + {9fc175c7-a869-47cf-a0ce-5447d6015ce9} + + + griffin + + \ No newline at end of file