diff --git a/gfx/common/d3d8_common.h b/gfx/common/d3d8_common.h index 84125e2d21..3d956a667b 100644 --- a/gfx/common/d3d8_common.h +++ b/gfx/common/d3d8_common.h @@ -199,13 +199,13 @@ static INLINE void d3d8_set_sampler_address_v(LPDIRECT3DDEVICE8 dev, } static INLINE void d3d8_set_sampler_minfilter(void *_dev, - unsigned sampler, unsigned value) + unsigned sampler, enum D3DTEXTUREFILTERTYPE value) { d3d8_set_texture_stage_state(_dev, sampler, D3DTSS_MINFILTER, value); } static INLINE void d3d8_set_sampler_magfilter(void *_dev, - unsigned sampler, unsigned value) + unsigned sampler, enum D3DTEXTUREFILTERTYPE value) { d3d8_set_texture_stage_state(_dev, sampler, D3DTSS_MAGFILTER, value); } diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c index 245af75ee4..dbd1bdc219 100644 --- a/gfx/common/win32_common.c +++ b/gfx/common/win32_common.c @@ -825,7 +825,7 @@ LRESULT CALLBACK WndProcD3D(HWND hwnd, UINT message, } #endif -#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_VULKAN) LRESULT CALLBACK WndProcGL(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { diff --git a/gfx/common/win32_common.h b/gfx/common/win32_common.h index 04a317155c..932ce5b434 100644 --- a/gfx/common/win32_common.h +++ b/gfx/common/win32_common.h @@ -127,7 +127,7 @@ LRESULT CALLBACK WndProcD3D(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); #endif -#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_VULKAN) LRESULT CALLBACK WndProcGL(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); #endif diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c index f5aa6bf2c0..f5d34bfb4f 100644 --- a/gfx/drivers/d3d8.c +++ b/gfx/drivers/d3d8.c @@ -429,13 +429,13 @@ static void d3d8_overlay_render(d3d8_video_t *d3d, overlay_t *overlay, bool force_linear) { D3DVIEWPORT8 vp_full; - D3DTEXTUREFILTERTYPE filter_type; struct video_viewport vp; void *verts; unsigned i; Vertex vert[4]; - unsigned width = video_info->width; - unsigned height = video_info->height; + enum D3DTEXTUREFILTERTYPE filter_type = D3DTEXF_LINEAR; + unsigned width = video_info->width; + unsigned height = video_info->height; if (!d3d || !overlay || !overlay->tex) return; diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c index 078c7446c2..b932ee9c2c 100644 --- a/gfx/drivers_context/wgl_ctx.c +++ b/gfx/drivers_context/wgl_ctx.c @@ -47,15 +47,17 @@ #include "../common/win32_common.h" -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) #include "../common/gl_common.h" +#elif defined(HAVE_OPENGL1) +#include "../common/gl1_common.h" #endif #ifdef HAVE_VULKAN #include "../common/vulkan_common.h" #endif -#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_VULKAN) #ifndef WGL_CONTEXT_MAJOR_VERSION_ARB #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 #endif @@ -81,7 +83,7 @@ #endif #endif -#if defined(HAVE_OPENGL) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) typedef HGLRC (APIENTRY *wglCreateContextAttribsProc)(HDC, HGLRC, const int*); static wglCreateContextAttribsProc pcreate_context; #endif @@ -107,7 +109,7 @@ static enum gfx_ctx_api win32_api = GFX_CTX_NONE; static dylib_t dll_handle = NULL; /* Handle to OpenGL32.dll */ #endif -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) static bool wgl_has_extension(const char *extension, const char *extensions) { const char *start = NULL; @@ -149,7 +151,7 @@ static gfx_ctx_proc_t gfx_ctx_wgl_get_proc_address(const char *symbol) switch (win32_api) { case GFX_CTX_OPENGL_API: -#if defined(HAVE_OPENGL) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) { gfx_ctx_proc_t func = (gfx_ctx_proc_t)wglGetProcAddress(symbol); if (func) @@ -168,7 +170,7 @@ static gfx_ctx_proc_t gfx_ctx_wgl_get_proc_address(const char *symbol) #endif } -#if defined(HAVE_OPENGL) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) static void setup_pixel_format(HDC hdc) { PIXELFORMATDESCRIPTOR pfd = {0}; @@ -323,7 +325,7 @@ void create_graphics_context(HWND hwnd, bool *quit) switch (win32_api) { case GFX_CTX_OPENGL_API: -#if defined(HAVE_OPENGL) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) create_gl_context(hwnd, quit); #endif break; @@ -367,7 +369,7 @@ static void gfx_ctx_wgl_swap_interval(void *data, int interval) switch (win32_api) { case GFX_CTX_OPENGL_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) win32_interval = interval; if (!win32_hrc) return; @@ -585,7 +587,7 @@ static void gfx_ctx_wgl_destroy(void *data) switch (win32_api) { case GFX_CTX_OPENGL_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) if (win32_hrc) { glFinish(); @@ -747,7 +749,7 @@ static bool gfx_ctx_wgl_bind_api(void *data, win32_minor = minor; win32_api = api; -#if defined(HAVE_OPENGL) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) if (api == GFX_CTX_OPENGL_API) return true; #endif @@ -770,7 +772,7 @@ static void gfx_ctx_wgl_bind_hw_render(void *data, bool enable) switch (win32_api) { case GFX_CTX_OPENGL_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) win32_use_hw_ctx = enable; if (win32_hdc) @@ -843,11 +845,9 @@ static void gfx_ctx_wgl_set_flags(void *data, uint32_t flags) switch (win32_api) { case GFX_CTX_OPENGL_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) if (BIT32_GET(flags, GFX_CTX_FLAGS_ADAPTIVE_VSYNC)) - { wgl_adaptive_vsync = true; - } if (BIT32_GET(flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT)) win32_core_hw_context_enable = true; diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c index 61c3d60095..93a8a28d40 100644 --- a/gfx/drivers_context/x_ctx.c +++ b/gfx/drivers_context/x_ctx.c @@ -23,7 +23,7 @@ #include "../../config.h" #endif -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) #include #ifndef GLX_SAMPLE_BUFFERS @@ -53,7 +53,7 @@ #include "../common/vulkan_common.h" #endif -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) static int (*g_pglSwapInterval)(int); static int (*g_pglSwapIntervalSGI)(int); static void (*g_pglSwapIntervalEXT)(Display*, GLXDrawable, int); @@ -94,7 +94,7 @@ typedef struct gfx_ctx_x_data bool g_is_double; bool core_hw_context_enable; -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) GLXWindow g_glx_win; GLXContext g_ctx, g_hw_ctx; GLXFBConfig g_fbc; @@ -147,7 +147,7 @@ static const unsigned long retroarch_icon_data[] = { 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000 }; -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) static PFNGLXCREATECONTEXTATTRIBSARBPROC glx_create_context_attribs; static int GLXExtensionSupported(Display *dpy, const char *extension) @@ -192,7 +192,7 @@ static void gfx_ctx_x_destroy_resources(gfx_ctx_x_data_t *x) { case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) if (x->g_ctx) { if (x->swap_mode) @@ -262,7 +262,7 @@ static void gfx_ctx_x_destroy_resources(gfx_ctx_x_data_t *x) } } -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) g_pglSwapInterval = NULL; g_pglSwapIntervalSGI = NULL; g_pglSwapIntervalEXT = NULL; @@ -304,7 +304,7 @@ static void gfx_ctx_x_swap_interval(void *data, int interval) { case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) x->g_interval = interval; if (g_pglSwapIntervalEXT) @@ -352,7 +352,7 @@ static void gfx_ctx_x_swap_buffers(void *data, void *data2) { case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: -#if defined(HAVE_OPENGL) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) if (x->swap_mode) { if (x->g_interval) @@ -456,7 +456,7 @@ static void *gfx_ctx_x_init(video_frame_info_t *video_info, void *data) int nelements = 0; int major = 0; int minor = 0; -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) static const int visual_attribs[] = { GLX_X_RENDERABLE , True, GLX_DRAWABLE_TYPE , GLX_WINDOW_BIT, @@ -495,7 +495,7 @@ static void *gfx_ctx_x_init(video_frame_info_t *video_info, void *data) { case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: -#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_OPENGLES) glXQueryVersion(g_x11_dpy, &major, &minor); /* GLX 1.3+ minimum required. */ @@ -555,7 +555,7 @@ static void *gfx_ctx_x_init(video_frame_info_t *video_info, void *data) switch (x_api) { case GFX_CTX_OPENGL_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) if (GLXExtensionSupported(g_x11_dpy, "GLX_EXT_swap_control_tear")) { RARCH_LOG("[GLX]: GLX_EXT_swap_control_tear supported.\n"); @@ -633,7 +633,7 @@ static bool gfx_ctx_x_set_video_mode(void *data, { case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) vi = glXGetVisualFromFBConfig(g_x11_dpy, x->g_fbc); if (!vi) goto error; @@ -756,7 +756,7 @@ static bool gfx_ctx_x_set_video_mode(void *data, { case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) x->g_glx_win = glXCreateWindow(g_x11_dpy, x->g_fbc, g_x11_win, 0); #endif break; @@ -810,7 +810,7 @@ static bool gfx_ctx_x_set_video_mode(void *data, { case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) if (!x->g_ctx) { if (x->g_core_es || x->g_debug) @@ -924,7 +924,7 @@ static bool gfx_ctx_x_set_video_mode(void *data, { case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) glXGetConfig(g_x11_dpy, vi, GLX_DOUBLEBUFFER, &val); x->g_is_double = val; @@ -1039,7 +1039,7 @@ static gfx_ctx_proc_t gfx_ctx_x_get_proc_address(const char *symbol) { case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) return glXGetProcAddress((const GLubyte*)symbol); #else break; @@ -1069,7 +1069,7 @@ static bool gfx_ctx_x_bind_api(void *data, enum gfx_ctx_api api, switch (api) { case GFX_CTX_OPENGL_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) return true; #else break; @@ -1122,7 +1122,7 @@ static void gfx_ctx_x_bind_hw_render(void *data, bool enable) { case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) x->g_use_hw_ctx = enable; if (!g_x11_dpy || !x->g_glx_win) return; @@ -1230,7 +1230,7 @@ static void gfx_ctx_x_make_current(bool release) { case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) if (release) glXMakeContextCurrent(g_x11_dpy, None, None, NULL); else diff --git a/gfx/font_driver.c b/gfx/font_driver.c index 936872675a..e53bcc6ca4 100644 --- a/gfx/font_driver.c +++ b/gfx/font_driver.c @@ -151,7 +151,7 @@ static bool d3d9_font_init_first( } #endif -#ifdef HAVE_OPENGL +#if defined(HAVE_OPENGL) static const font_renderer_t *gl_font_backends[] = { &gl_raster_font, #if defined(HAVE_LIBDBGFONT) diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 5e0c098a09..f9df3a37ad 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -381,14 +381,14 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = { #if defined(HAVE_OPENDINGUX_FBDEV) &gfx_ctx_opendingux_fbdev, #endif -#if defined(_WIN32) && (defined(HAVE_OPENGL) || defined(HAVE_VULKAN)) +#if defined(_WIN32) && (defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_VULKAN)) &gfx_ctx_wgl, #endif #if defined(HAVE_WAYLAND) &gfx_ctx_wayland, #endif #if defined(HAVE_X11) && !defined(HAVE_OPENGLES) -#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_VULKAN) &gfx_ctx_x, #endif #endif @@ -410,7 +410,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = { #if defined(__APPLE__) && !defined(TARGET_IPHONE_SIMULATOR) && !defined(TARGET_OS_IPHONE) &gfx_ctx_cgl, #endif -#if (defined(HAVE_SDL) || defined(HAVE_SDL2)) && defined(HAVE_OPENGL) +#if (defined(HAVE_SDL) || defined(HAVE_SDL2)) && (defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)) &gfx_ctx_sdl_gl, #endif #ifdef HAVE_OSMESA diff --git a/griffin/griffin.c b/griffin/griffin.c index 627b86b292..529f1770ba 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -209,7 +209,7 @@ VIDEO CONTEXT #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) -#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_VULKAN) #include "../gfx/drivers_context/wgl_ctx.c" #endif @@ -416,11 +416,12 @@ VIDEO DRIVER #include "../gfx/display_servers/dispserv_null.c" -#ifdef HAVE_OPENGL -#include "../gfx/drivers/gl.c" #ifdef HAVE_OPENGL1 #include "../gfx/drivers/gl1.c" #endif + +#ifdef HAVE_OPENGL +#include "../gfx/drivers/gl.c" #ifdef HAVE_OPENGL_CORE #include "../gfx/drivers/gl_core.c" #endif @@ -499,11 +500,12 @@ FONTS #include "../gfx/drivers_font/ps_libdbgfont.c" #endif -#if defined(HAVE_OPENGL) -#include "../gfx/drivers_font/gl_raster_font.c" #ifdef HAVE_OPENGL1 #include "../gfx/drivers_font/gl1_raster_font.c" #endif + +#if defined(HAVE_OPENGL) +#include "../gfx/drivers_font/gl_raster_font.c" #ifdef HAVE_OPENGL_CORE #include "../gfx/drivers_font/gl_core_raster_font.c" #endif @@ -1267,11 +1269,12 @@ MENU #include "../menu/drivers_display/menu_display_d3d12.c" #endif -#ifdef HAVE_OPENGL -#include "../menu/drivers_display/menu_display_gl.c" #ifdef HAVE_OPENGL1 #include "../menu/drivers_display/menu_display_gl1.c" #endif + +#ifdef HAVE_OPENGL +#include "../menu/drivers_display/menu_display_gl.c" #ifdef HAVE_OPENGL_CORE #include "../menu/drivers_display/menu_display_gl_core.c" #endif diff --git a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj index 7531907b67..64b35deff4 100644 --- a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj +++ b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj @@ -21,7 +21,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(SolutionDir)\..\..\libretro-common\include";"$(SolutionDir)\..\..\libretro-common\include\compat\msvc";"$(SolutionDir)\..\..\deps";"$(SolutionDir)\..\..\deps\stb";"$(SolutionDir)\..\..\deps\rcheevos\include";"$(SolutionDir)\..\..\gfx\include"" - PreprocessorDefinitions="_WIN32;WINVER=0x0400;_WIN32_WINNT=0x0400;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETPLAYDISCOVERY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_D3D;HAVE_D3D8;DEBUG;_DEBUG;__STDC_CONSTANT_MACROS" + PreprocessorDefinitions="_WIN32;WINVER=0x0400;_WIN32_WINNT=0x0400;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETPLAYDISCOVERY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_D3D;HAVE_D3D8;HAVE_OPENGL1;DEBUG;_DEBUG;__STDC_CONSTANT_MACROS" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -33,7 +33,7 @@ Name="VCCustomBuildTool"/>