mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 04:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename GL driver files + add some comments to D3D drivers - gl_core

Browse Source 
becomes gl3, gl becomes gl2, etc
This commit is contained in:
twinaphex 2021-09-26 14:16:09 +02:00
parent 2a4862ad8d
commit 6f36e0a2dd
17 changed files with 68 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.common
View File

@ -1446,10 +1446,10 @@ endif
ifeq ($(HAVE_GL_CONTEXT), 1)
ifeq ($(HAVE_GL_MODERN), 1)
DEFINES += -DHAVE_OPENGL
OBJ += gfx/drivers/gl.o \
OBJ += gfx/drivers/gl2.o \
$(LIBRETRO_COMM_DIR)/gfx/gl_capabilities.o \
gfx/drivers_font/gl_raster_font.o \
gfx/drivers_display/gfx_display_gl.o
gfx/drivers_font/gl2_raster_font.o \
gfx/drivers_display/gfx_display_gl2.o
endif
OBJ += $(LIBRETRO_COMM_DIR)/glsym/rglgen.o
@ -1458,7 +1458,7 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
DEFINES += -DHAVE_OPENGL1
OBJ += gfx/drivers/gl1.o \
gfx/drivers_font/gl1_raster_font.o \
gfx/drivers_display/gfx_display_gl1.o
gfx/drivers_display/gfx_display_gl1.o
endif
ifeq ($(HAVE_VIDEOCORE), 1)
@ -1626,10 +1626,10 @@ ifeq ($(HAVE_VULKAN), 1)
endif
ifeq ($(HAVE_OPENGL_CORE), 1)
OBJ += gfx/drivers/gl_core.o \
gfx/drivers_font/gl_core_raster_font.o \
gfx/drivers_shader/shader_gl_core.o \
gfx/drivers_display/gfx_display_gl_core.o
OBJ += gfx/drivers/gl3.o \
gfx/drivers_font/gl3_raster_font.o \
gfx/drivers_shader/shader_gl3.o \
gfx/drivers_display/gfx_display_gl3.o
DEFINES += -DHAVE_OPENGL_CORE
NEED_CXX_LINKER = 1

2
gfx/common/gl_core_common.h → gfx/common/gl3_common.h
View File

@ -34,7 +34,7 @@
#include "../video_coord_array.h"
#include "../../retroarch.h"
#include "../drivers_shader/shader_gl_core.h"
#include "../drivers_shader/shader_gl3.h"
RETRO_BEGIN_DECLS

7
gfx/drivers/d3d10.c
View File

@ -14,6 +14,13 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/* Direct3D 10 driver.
*
* Minimum version : Direct3D 10.0 (2006)
* Minimum OS : Windows Vista
* Recommended OS : Windows Vista and/or later
*/
#define CINTERFACE
#define COBJMACROS

7
gfx/drivers/d3d11.c
View File

@ -14,6 +14,13 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/* Direct3D 11 driver.
*
* Minimum version : Direct3D 11.0 (Feature Level 11.0) (2009)
* Minimum OS : Windows Vista, Windows 7
* Recommended OS : Windows 7 and/or later
*/
#define CINTERFACE
#define COBJMACROS

7
gfx/drivers/d3d12.c
View File

@ -14,6 +14,13 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/* Direct3D 12 driver.
*
* Minimum version : Direct3D 12.0 (2015)
* Minimum OS : Windows 7, Windows 8
* Recommended OS : Windows 10
*/
#define CINTERFACE
#include <assert.h>

7
gfx/drivers/d3d8.c
View File

@ -15,6 +15,13 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/* Direct3D 8 driver.
*
* Minimum version : Direct3D 8.0 (2000)
* Minimum OS : Windows 95 (8.0a), Windows 98 and XP after 8.0a
* Recommended OS : Windows 98/ME and/or Windows XP
*/
#define CINTERFACE
#ifdef _XBOX

7
gfx/drivers/d3d9.c
View File

@ -15,6 +15,13 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/* Direct3D 9 driver.
*
* Minimum version : Direct3D 9.0 (2002)
* Minimum OS : Windows 98, Windows 2000, Windows ME
* Recommended OS : Windows XP
*/
#define CINTERFACE
#ifdef _XBOX

10
gfx/drivers/gl1.c
View File

@ -15,10 +15,14 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/* OpenGL driver.
/* OpenGL 1.x driver.
*
* We are targeting a minimum of OpenGL 1.1 and the Microsoft "GDI Generic" software GL implementation.
* Any additional features added for later 1.x versions should only be enabled if they are detected at runtime. */
* Minimum version : OpenGL 1.1 (1997)
*
* We are targeting a minimum of OpenGL 1.1 and the Microsoft
* "GDI Generic" * software GL implementation.
* Any additional features added for later 1.x versions should only be
* enabled if they are detected at runtime. */
#include <stddef.h>
#include <retro_miscellaneous.h>

6
gfx/drivers/gl.c → gfx/drivers/gl2.c
View File

@ -15,10 +15,10 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/* Middle of the road OpenGL driver.
/* Middle of the road OpenGL 2.x driver.
*
* Minimum version (desktop): OpenGL 2.0+
* Minimum version (mobile) : OpenGLES 2.0+
* Minimum version (desktop): OpenGL 2.0+ (2004)
* Minimum version (mobile) : OpenGLES 2.0+ (2007)
*/
#ifdef _MSC_VER

6
gfx/drivers/gl_core.c → gfx/drivers/gl3.c
View File

@ -15,15 +15,15 @@
/* Modern OpenGL driver.
*
* Minimum version (desktop): OpenGL 3.2+
* Minimum version (mobile) : OpenGLES 3.0+
* Minimum version (desktop): OpenGL 3.2+ (2009)
* Minimum version (mobile) : OpenGLES 3.0+ (2012)
*/
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#include "../common/gl_core_common.h"
#include "../common/gl3_common.h"
#include <gfx/gl_capabilities.h>
#include <gfx/video_frame.h>

0
gfx/drivers_display/gfx_display_gl.c → gfx/drivers_display/gfx_display_gl2.c
View File

4
gfx/drivers_display/gfx_display_gl_core.c → gfx/drivers_display/gfx_display_gl3.c
View File

@ -15,17 +15,17 @@
*/
#include <retro_miscellaneous.h>
#include <gfx/common/gl_core_common.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#include "../common/gl3_common.h"
#include "../gfx_display.h"
#include "../font_driver.h"
#include "../../retroarch.h"
#include "../common/gl_core_common.h"
static const float gl_core_vertexes[] = {
0, 0,

0
gfx/drivers_font/gl_raster_font.c → gfx/drivers_font/gl2_raster_font.c
View File

3
gfx/drivers_font/gl_core_raster_font.c → gfx/drivers_font/gl3_raster_font.c
View File

@ -20,9 +20,8 @@
#include <encodings/utf.h>
#include <string/stdstring.h>
#include <retro_math.h>
#include <gfx/common/gl_core_common.h>
#include "../common/gl_core_common.h"
#include "../common/gl3_common.h"
#include "../font_driver.h"
#include "../../configuration.h"
#include "../../verbosity.h"

4
gfx/drivers_shader/shader_gl_core.cpp → gfx/drivers_shader/shader_gl3.cpp
View File

@ -13,7 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "shader_gl_core.h"
#include "shader_gl3.h"
#include "glslang_util.h"
#include "glslang_util_cxx.h"
@ -32,7 +32,7 @@
#include "slang_reflection.hpp"
#include "spirv_glsl.hpp"
#include "../common/gl_core_common.h"
#include "../common/gl3_common.h"
#include "../../verbosity.h"
#include "../../msg_hash.h"

0
gfx/drivers_shader/shader_gl_core.h → gfx/drivers_shader/shader_gl3.h
View File

12
griffin/griffin.c
View File

@ -501,13 +501,13 @@ VIDEO DRIVER
#endif
#ifdef HAVE_OPENGL_CORE
#include "../gfx/drivers/gl_core.c"
#include "../gfx/drivers_display/gfx_display_gl_core.c"
#include "../gfx/drivers/gl3.c"
#include "../gfx/drivers_display/gfx_display_gl3.c"
#endif
#ifdef HAVE_OPENGL
#include "../gfx/drivers/gl.c"
#include "../gfx/drivers_display/gfx_display_gl.c"
#include "../gfx/drivers/gl2.c"
#include "../gfx/drivers_display/gfx_display_gl2.c"
#endif
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL_CORE)
@ -604,11 +604,11 @@ FONTS
#endif
#if defined(HAVE_OPENGL)
#include "../gfx/drivers_font/gl_raster_font.c"
#include "../gfx/drivers_font/gl2_raster_font.c"
#endif
#ifdef HAVE_OPENGL_CORE
#include "../gfx/drivers_font/gl_core_raster_font.c"
#include "../gfx/drivers_font/gl3_raster_font.c"
#endif
#if defined(_XBOX1)