Commit 2638f820 by Nicolas Capens Committed by Nicolas Capens

Revert "Use official headers to define GL_ARB_texture_rectangle."

This reverts commit 9869bedb. It broke 32-bit builds on Windows because GLsizeiptr and GLintptr are defined as different types (int vs. long) in gl2.h and glcorearb.h. See also https://github.com/KhronosGroup/OpenGL-Registry/issues/162 Change-Id: Ia7bd4accb1671529ce6da6849a1df76dceddcdee Reviewed-on: https://swiftshader-review.googlesource.com/18068Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com>
parent 4aea88cf
......@@ -67,6 +67,29 @@ typedef unsigned int GLenum;
#define GL_FRAGMENT_SHADER 0x8B30
#define GL_VERTEX_SHADER 0x8B31
// Note: GL_ARB_texture_rectangle is part of gl2extchromium.h in the Chromium repo
// GL_ARB_texture_rectangle
#ifndef GL_ARB_texture_rectangle
#define GL_ARB_texture_rectangle 1
#ifndef GL_SAMPLER_2D_RECT_ARB
#define GL_SAMPLER_2D_RECT_ARB 0x8B63
#endif
#ifndef GL_TEXTURE_BINDING_RECTANGLE_ARB
#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6
#endif
#ifndef GL_TEXTURE_RECTANGLE_ARB
#define GL_TEXTURE_RECTANGLE_ARB 0x84F5
#endif
#ifndef GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB
#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
#endif
#endif // GL_ARB_texture_rectangle
//
// The base class for the machine dependent compiler to derive from
// for managing object code from the compile.
......
......@@ -23,8 +23,6 @@
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <GLES3/gl3.h>
#include <GL/glcorearb.h>
#include <GL/glext.h>
#include <stdlib.h>
......
......@@ -22,6 +22,8 @@
#include "Texture.h"
#include "utilities.h"
#include "compiler/Compiler.h"
namespace es2
{
RenderbufferInterface::RenderbufferInterface()
......
......@@ -23,8 +23,6 @@
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <GL/glcorearb.h>
#include <GL/glext.h>
#include <string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment