OSDN Git Service

Revert "Use official headers to define GL_ARB_texture_rectangle."
authorNicolas Capens <capn@google.com>
Tue, 27 Mar 2018 13:39:37 +0000 (09:39 -0400)
committerNicolas Capens <nicolascapens@google.com>
Tue, 27 Mar 2018 13:47:03 +0000 (13:47 +0000)
commit2638f8201e027be24882a706a44da90dd3ba81e7
tree82adfb476bba9de061af9ff509a1a8587a84203f
parent4aea88cf6d3c5da7961bf7d117ced192fe3c56e9
Revert "Use official headers to define GL_ARB_texture_rectangle."

This reverts commit 9869bedb56822d19c9bfbdb33f6af061da8e6106.

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/18068
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
src/OpenGL/compiler/Compiler.h
src/OpenGL/compiler/OutputASM.cpp
src/OpenGL/libGLESv2/Renderbuffer.cpp
src/OpenGL/libGLESv2/utilities.h