Remove one useless HAVE_OPENGLES2 ifdef, and remove some wrong

defines
This commit is contained in:
twinaphex 2016-08-07 04:35:38 +02:00
parent df1c0bc9b4
commit fb9a2eea95
2 changed files with 2 additions and 8 deletions

View File

@ -56,7 +56,7 @@
#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0
#endif
#if defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3) || defined(HAVE_OPENGLES31) || defined(HAVE_OPENGLES32)
#if defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3) || defined(HAVE_OPENGLES_3_1) || defined(HAVE_OPENGLES_3_2)
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT
@ -146,7 +146,7 @@
#define NO_GL_READ_PIXELS
#endif
#if defined(HAVE_OPENGL_MODERN) || defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3) || defined(HAVE_OPENGLES31) || defined(HAVE_OPENGLES32) || defined(HAVE_PSGL)
#if defined(HAVE_OPENGL_MODERN) || defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3) || defined(HAVE_OPENGLES_3_1) || defined(HAVE_OPENGLES_3_2) || defined(HAVE_PSGL)
#ifndef NO_GL_FF_VERTEX
#define NO_GL_FF_VERTEX

View File

@ -38,12 +38,6 @@
#include "../common/gl_common.h"
#endif
#ifdef HAVE_OPENGLES2
#define BORDER_FUNC GL_CLAMP_TO_EDGE
#else
#define BORDER_FUNC GL_CLAMP_TO_BORDER
#endif
#define PREV_TEXTURES (GFX_MAX_TEXTURES - 1)
/* Cache the VBO. */