mirror of
https://github.com/libretro/RetroArch
synced 2025-03-25 16:44:01 +00:00
Cleanups
This commit is contained in:
twinaphex
parent
9558e569f1
commit
512a1b4cb6
@ -14,18 +14,13 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <gfx/math/matrix_4x4.h>
|
|
||||||
#include <gfx/gl_capabilities.h>
|
#include <gfx/gl_capabilities.h>
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "../../config.h"
|
#include "../../config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <glsym/glsym.h>
|
#include "gl_common.h"
|
||||||
|
|
||||||
#include "../drivers/gl_symlinks.h"
|
|
||||||
#include "../video_coord_array.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void gl_size_format(GLint* internalFormat)
|
static void gl_size_format(GLint* internalFormat)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,9 @@
|
|||||||
#ifndef __GL_COMMON_H
|
#ifndef __GL_COMMON_H
|
||||||
#define __GL_COMMON_H
|
#define __GL_COMMON_H
|
||||||
|
|
||||||
|
#include <boolean.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <retro_common_api.h>
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "../../config.h"
|
#include "../../config.h"
|
||||||
@ -32,13 +34,128 @@
|
|||||||
#include "../font_driver.h"
|
#include "../font_driver.h"
|
||||||
#include "../video_coord_array.h"
|
#include "../video_coord_array.h"
|
||||||
#include "../video_driver.h"
|
#include "../video_driver.h"
|
||||||
#include "../drivers/gl_symlinks.h"
|
|
||||||
#include <glsym/glsym.h>
|
#include <glsym/glsym.h>
|
||||||
|
|
||||||
RETRO_BEGIN_DECLS
|
RETRO_BEGIN_DECLS
|
||||||
|
|
||||||
#define MAX_FENCES 4
|
#define MAX_FENCES 4
|
||||||
|
|
||||||
|
#if defined(HAVE_PSGL)
|
||||||
|
#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
|
||||||
|
#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES
|
||||||
|
#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
|
||||||
|
#elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
|
||||||
|
#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT
|
||||||
|
#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_EXT
|
||||||
|
#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
|
||||||
|
#else
|
||||||
|
#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER
|
||||||
|
#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE
|
||||||
|
#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3) || defined(HAVE_OPENGLES_3_1) || defined(HAVE_OPENGLES_3_2)
|
||||||
|
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER
|
||||||
|
#if defined(HAVE_OPENGLES2)
|
||||||
|
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES
|
||||||
|
#else
|
||||||
|
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8
|
||||||
|
#endif
|
||||||
|
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT
|
||||||
|
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT
|
||||||
|
#elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
|
||||||
|
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER_EXT
|
||||||
|
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT
|
||||||
|
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT
|
||||||
|
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT_EXT
|
||||||
|
#elif defined(HAVE_PSGL)
|
||||||
|
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER_OES
|
||||||
|
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_SCE
|
||||||
|
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_OES
|
||||||
|
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT_OES
|
||||||
|
#else
|
||||||
|
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER
|
||||||
|
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8
|
||||||
|
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT
|
||||||
|
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
|
||||||
|
#define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE_EXT
|
||||||
|
#elif defined(HAVE_PSGL)
|
||||||
|
#define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE_OES
|
||||||
|
#else
|
||||||
|
#define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_PSGL)
|
||||||
|
#define glGenerateMipmap glGenerateMipmapOES
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__APPLE__) || defined(HAVE_PSGL)
|
||||||
|
#define GL_RGBA32F GL_RGBA32F_ARB
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_PSGL)
|
||||||
|
#define RARCH_GL_INTERNAL_FORMAT32 GL_ARGB_SCE
|
||||||
|
#define RARCH_GL_INTERNAL_FORMAT16 GL_RGB5 /* TODO: Verify if this is really 565 or just 555. */
|
||||||
|
#define RARCH_GL_TEXTURE_TYPE32 GL_BGRA
|
||||||
|
#define RARCH_GL_TEXTURE_TYPE16 GL_BGRA
|
||||||
|
#define RARCH_GL_FORMAT32 GL_UNSIGNED_INT_8_8_8_8_REV
|
||||||
|
#define RARCH_GL_FORMAT16 GL_RGB5
|
||||||
|
#elif defined(HAVE_OPENGLES)
|
||||||
|
/* Imgtec/SGX headers have this missing. */
|
||||||
|
#ifndef GL_BGRA_EXT
|
||||||
|
#define GL_BGRA_EXT 0x80E1
|
||||||
|
#endif
|
||||||
|
#ifndef GL_BGRA8_EXT
|
||||||
|
#define GL_BGRA8_EXT 0x93A1
|
||||||
|
#endif
|
||||||
|
#ifdef IOS
|
||||||
|
/* Stupid Apple */
|
||||||
|
#define RARCH_GL_INTERNAL_FORMAT32 GL_RGBA
|
||||||
|
#else
|
||||||
|
#define RARCH_GL_INTERNAL_FORMAT32 GL_BGRA_EXT
|
||||||
|
#endif
|
||||||
|
#define RARCH_GL_INTERNAL_FORMAT16 GL_RGB
|
||||||
|
#define RARCH_GL_TEXTURE_TYPE32 GL_BGRA_EXT
|
||||||
|
#define RARCH_GL_TEXTURE_TYPE16 GL_RGB
|
||||||
|
#define RARCH_GL_FORMAT32 GL_UNSIGNED_BYTE
|
||||||
|
#define RARCH_GL_FORMAT16 GL_UNSIGNED_SHORT_5_6_5
|
||||||
|
#else
|
||||||
|
/* On desktop, we always use 32-bit. */
|
||||||
|
#define RARCH_GL_INTERNAL_FORMAT32 GL_RGBA8
|
||||||
|
#define RARCH_GL_INTERNAL_FORMAT16 GL_RGBA8
|
||||||
|
#define RARCH_GL_TEXTURE_TYPE32 GL_BGRA
|
||||||
|
#define RARCH_GL_TEXTURE_TYPE16 GL_BGRA
|
||||||
|
#define RARCH_GL_FORMAT32 GL_UNSIGNED_INT_8_8_8_8_REV
|
||||||
|
#define RARCH_GL_FORMAT16 GL_UNSIGNED_INT_8_8_8_8_REV
|
||||||
|
|
||||||
|
/* GL_RGB565 internal format isn't in desktop GL
|
||||||
|
* until 4.1 core (ARB_ES2_compatibility).
|
||||||
|
* Check for this. */
|
||||||
|
#ifndef GL_RGB565
|
||||||
|
#define GL_RGB565 0x8D62
|
||||||
|
#endif
|
||||||
|
#define RARCH_GL_INTERNAL_FORMAT16_565 GL_RGB565
|
||||||
|
#define RARCH_GL_TEXTURE_TYPE16_565 GL_RGB
|
||||||
|
#define RARCH_GL_FORMAT16_565 GL_UNSIGNED_SHORT_5_6_5
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_OPENGLES2) /* TODO: Figure out exactly what. */
|
||||||
|
#define NO_GL_CLAMP_TO_BORDER
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_OPENGLES)
|
||||||
|
#ifndef GL_UNPACK_ROW_LENGTH
|
||||||
|
#define GL_UNPACK_ROW_LENGTH 0x0CF2
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef GL_SRGB_ALPHA_EXT
|
||||||
|
#define GL_SRGB_ALPHA_EXT 0x8C42
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef struct gl
|
typedef struct gl
|
||||||
{
|
{
|
||||||
GLenum internal_fmt;
|
GLenum internal_fmt;
|
||||||
|
|||||||
@ -1,144 +0,0 @@
|
|||||||
/* RetroArch - A frontend for libretro.
|
|
||||||
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
|
|
||||||
* Copyright (C) 2011-2017 - Daniel De Matteis
|
|
||||||
* Copyright (C) 2012-2015 - Michael Lelli
|
|
||||||
*
|
|
||||||
* RetroArch is free software: you can redistribute it and/or modify it under the terms
|
|
||||||
* of the GNU General Public License as published by the Free Software Found-
|
|
||||||
* ation, either version 3 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
|
||||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
||||||
* PURPOSE. See the GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along with RetroArch.
|
|
||||||
* If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _GL_SYMLINKS_H
|
|
||||||
#define _GL_SYMLINKS_H
|
|
||||||
|
|
||||||
#include <boolean.h>
|
|
||||||
#include <retro_common_api.h>
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(HAVE_PSGL)
|
|
||||||
#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
|
|
||||||
#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES
|
|
||||||
#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
|
|
||||||
#elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
|
|
||||||
#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT
|
|
||||||
#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_EXT
|
|
||||||
#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
|
|
||||||
#else
|
|
||||||
#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER
|
|
||||||
#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE
|
|
||||||
#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3) || defined(HAVE_OPENGLES_3_1) || defined(HAVE_OPENGLES_3_2)
|
|
||||||
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER
|
|
||||||
#if defined(HAVE_OPENGLES2)
|
|
||||||
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES
|
|
||||||
#else
|
|
||||||
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8
|
|
||||||
#endif
|
|
||||||
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT
|
|
||||||
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT
|
|
||||||
#elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
|
|
||||||
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER_EXT
|
|
||||||
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT
|
|
||||||
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT
|
|
||||||
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT_EXT
|
|
||||||
#elif defined(HAVE_PSGL)
|
|
||||||
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER_OES
|
|
||||||
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_SCE
|
|
||||||
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_OES
|
|
||||||
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT_OES
|
|
||||||
#else
|
|
||||||
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER
|
|
||||||
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8
|
|
||||||
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT
|
|
||||||
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
|
|
||||||
#define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE_EXT
|
|
||||||
#elif defined(HAVE_PSGL)
|
|
||||||
#define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE_OES
|
|
||||||
#else
|
|
||||||
#define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(HAVE_PSGL)
|
|
||||||
#define glGenerateMipmap glGenerateMipmapOES
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__APPLE__) || defined(HAVE_PSGL)
|
|
||||||
#define GL_RGBA32F GL_RGBA32F_ARB
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(HAVE_PSGL)
|
|
||||||
#define RARCH_GL_INTERNAL_FORMAT32 GL_ARGB_SCE
|
|
||||||
#define RARCH_GL_INTERNAL_FORMAT16 GL_RGB5 /* TODO: Verify if this is really 565 or just 555. */
|
|
||||||
#define RARCH_GL_TEXTURE_TYPE32 GL_BGRA
|
|
||||||
#define RARCH_GL_TEXTURE_TYPE16 GL_BGRA
|
|
||||||
#define RARCH_GL_FORMAT32 GL_UNSIGNED_INT_8_8_8_8_REV
|
|
||||||
#define RARCH_GL_FORMAT16 GL_RGB5
|
|
||||||
#elif defined(HAVE_OPENGLES)
|
|
||||||
/* Imgtec/SGX headers have this missing. */
|
|
||||||
#ifndef GL_BGRA_EXT
|
|
||||||
#define GL_BGRA_EXT 0x80E1
|
|
||||||
#endif
|
|
||||||
#ifndef GL_BGRA8_EXT
|
|
||||||
#define GL_BGRA8_EXT 0x93A1
|
|
||||||
#endif
|
|
||||||
#ifdef IOS
|
|
||||||
/* Stupid Apple */
|
|
||||||
#define RARCH_GL_INTERNAL_FORMAT32 GL_RGBA
|
|
||||||
#else
|
|
||||||
#define RARCH_GL_INTERNAL_FORMAT32 GL_BGRA_EXT
|
|
||||||
#endif
|
|
||||||
#define RARCH_GL_INTERNAL_FORMAT16 GL_RGB
|
|
||||||
#define RARCH_GL_TEXTURE_TYPE32 GL_BGRA_EXT
|
|
||||||
#define RARCH_GL_TEXTURE_TYPE16 GL_RGB
|
|
||||||
#define RARCH_GL_FORMAT32 GL_UNSIGNED_BYTE
|
|
||||||
#define RARCH_GL_FORMAT16 GL_UNSIGNED_SHORT_5_6_5
|
|
||||||
#else
|
|
||||||
/* On desktop, we always use 32-bit. */
|
|
||||||
#define RARCH_GL_INTERNAL_FORMAT32 GL_RGBA8
|
|
||||||
#define RARCH_GL_INTERNAL_FORMAT16 GL_RGBA8
|
|
||||||
#define RARCH_GL_TEXTURE_TYPE32 GL_BGRA
|
|
||||||
#define RARCH_GL_TEXTURE_TYPE16 GL_BGRA
|
|
||||||
#define RARCH_GL_FORMAT32 GL_UNSIGNED_INT_8_8_8_8_REV
|
|
||||||
#define RARCH_GL_FORMAT16 GL_UNSIGNED_INT_8_8_8_8_REV
|
|
||||||
|
|
||||||
/* GL_RGB565 internal format isn't in desktop GL
|
|
||||||
* until 4.1 core (ARB_ES2_compatibility).
|
|
||||||
* Check for this. */
|
|
||||||
#ifndef GL_RGB565
|
|
||||||
#define GL_RGB565 0x8D62
|
|
||||||
#endif
|
|
||||||
#define RARCH_GL_INTERNAL_FORMAT16_565 GL_RGB565
|
|
||||||
#define RARCH_GL_TEXTURE_TYPE16_565 GL_RGB
|
|
||||||
#define RARCH_GL_FORMAT16_565 GL_UNSIGNED_SHORT_5_6_5
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(HAVE_OPENGLES2) /* TODO: Figure out exactly what. */
|
|
||||||
#define NO_GL_CLAMP_TO_BORDER
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(HAVE_OPENGLES)
|
|
||||||
#ifndef GL_UNPACK_ROW_LENGTH
|
|
||||||
#define GL_UNPACK_ROW_LENGTH 0x0CF2
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef GL_SRGB_ALPHA_EXT
|
|
||||||
#define GL_SRGB_ALPHA_EXT 0x8C42
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
Loading…
x
Reference in New Issue
Block a user