66089a33ea
Adds support for formerly-unimplemented methods: glCurrentPaletteMatrixOES glLoadPaletteFromModelViewMatrixOES glMatrixIndexPointerOES glWeightPointerOES The bulk of the changes are related to implementing the two PointerOES methods, which are implemented pretty much the same way as the existing Pointer methods were implemented. This change also changes the way glPointSizePointerOES is implemented, making it act like all the other Pointer methods. (Previously it was not handling non-direct-buffer arguments correctly.) Fixes bug 2308625 "Support matrix palette skinning in JSR239 and related APIs" Also updated GLLogWraper to fix two bugs in GLLogWrapper that were discovered while testing matrix palette skinning support: a) Handle trying to print the contents of null-but-enabled buffers. (It's not legal to draw with null-but-enabled buffers, and in fact some OpenGL drivers will crash if you try to render in this state, but there's no reason the GLLogWrapper should crash while trying to debug this situation. b) Don't read off the end of a vertex buffer with non-zero position when printing the entire contents of the vertex buffer. Now we only print from the current position to the end of the buffer.
191 lines
6.4 KiB
C++
191 lines
6.4 KiB
C++
/*
|
|
** Copyright 2007, The Android Open Source Project
|
|
**
|
|
** Licensed under the Apache License, Version 2.0 (the "License");
|
|
** you may not use this file except in compliance with the License.
|
|
** You may obtain a copy of the License at
|
|
**
|
|
** http://www.apache.org/licenses/LICENSE-2.0
|
|
**
|
|
** Unless required by applicable law or agreed to in writing, software
|
|
** distributed under the License is distributed on an "AS IS" BASIS,
|
|
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
** See the License for the specific language governing permissions and
|
|
** limitations under the License.
|
|
*/
|
|
|
|
#include <ctype.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
#include <sys/ioctl.h>
|
|
|
|
#include <GLES/gl.h>
|
|
#include <GLES/glext.h>
|
|
|
|
#include <cutils/log.h>
|
|
#include <cutils/properties.h>
|
|
|
|
#include "hooks.h"
|
|
#include "egl_impl.h"
|
|
|
|
using namespace android;
|
|
|
|
// set this to 1 for crude GL debugging
|
|
#define CHECK_FOR_GL_ERRORS 0
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// extensions for the framework
|
|
// ----------------------------------------------------------------------------
|
|
|
|
extern "C" {
|
|
GL_API void GL_APIENTRY glColorPointerBounds(GLint size, GLenum type, GLsizei stride,
|
|
const GLvoid *ptr, GLsizei count);
|
|
GL_API void GL_APIENTRY glNormalPointerBounds(GLenum type, GLsizei stride,
|
|
const GLvoid *pointer, GLsizei count);
|
|
GL_API void GL_APIENTRY glTexCoordPointerBounds(GLint size, GLenum type,
|
|
GLsizei stride, const GLvoid *pointer, GLsizei count);
|
|
GL_API void GL_APIENTRY glVertexPointerBounds(GLint size, GLenum type,
|
|
GLsizei stride, const GLvoid *pointer, GLsizei count);
|
|
GL_API void GL_APIENTRY glPointSizePointerOESBounds(GLenum type,
|
|
GLsizei stride, const GLvoid *pointer, GLsizei count);
|
|
GL_API void GL_APIENTRY glMatrixIndexPointerOESBounds(GLint size, GLenum type,
|
|
GLsizei stride, const GLvoid *pointer, GLsizei count);
|
|
GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type,
|
|
GLsizei stride, const GLvoid *pointer, GLsizei count);
|
|
}
|
|
|
|
void glColorPointerBounds(GLint size, GLenum type, GLsizei stride,
|
|
const GLvoid *ptr, GLsizei count) {
|
|
glColorPointer(size, type, stride, ptr);
|
|
}
|
|
void glNormalPointerBounds(GLenum type, GLsizei stride,
|
|
const GLvoid *pointer, GLsizei count) {
|
|
glNormalPointer(type, stride, pointer);
|
|
}
|
|
void glTexCoordPointerBounds(GLint size, GLenum type,
|
|
GLsizei stride, const GLvoid *pointer, GLsizei count) {
|
|
glTexCoordPointer(size, type, stride, pointer);
|
|
}
|
|
void glVertexPointerBounds(GLint size, GLenum type,
|
|
GLsizei stride, const GLvoid *pointer, GLsizei count) {
|
|
glVertexPointer(size, type, stride, pointer);
|
|
}
|
|
|
|
void GL_APIENTRY glPointSizePointerOESBounds(GLenum type,
|
|
GLsizei stride, const GLvoid *pointer, GLsizei count) {
|
|
glPointSizePointerOES(type, stride, pointer);
|
|
}
|
|
|
|
GL_API void GL_APIENTRY glMatrixIndexPointerOESBounds(GLint size, GLenum type,
|
|
GLsizei stride, const GLvoid *pointer, GLsizei count) {
|
|
glMatrixIndexPointerOES(size, type, stride, pointer);
|
|
}
|
|
|
|
GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type,
|
|
GLsizei stride, const GLvoid *pointer, GLsizei count) {
|
|
glWeightPointerOES(size, type, stride, pointer);
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Actual GL entry-points
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#undef API_ENTRY
|
|
#undef CALL_GL_API
|
|
#undef CALL_GL_API_RETURN
|
|
|
|
#if USE_FAST_TLS_KEY && !CHECK_FOR_GL_ERRORS
|
|
|
|
#ifdef HAVE_ARM_TLS_REGISTER
|
|
#define GET_TLS(reg) \
|
|
"mrc p15, 0, " #reg ", c13, c0, 3 \n"
|
|
#else
|
|
#define GET_TLS(reg) \
|
|
"mov " #reg ", #0xFFFF0FFF \n" \
|
|
"ldr " #reg ", [" #reg ", #-15] \n"
|
|
#endif
|
|
|
|
#define API_ENTRY(_api) __attribute__((naked)) _api
|
|
|
|
#define CALL_GL_API(_api, ...) \
|
|
asm volatile( \
|
|
GET_TLS(r12) \
|
|
"ldr r12, [r12, %[tls]] \n" \
|
|
"cmp r12, #0 \n" \
|
|
"ldrne pc, [r12, %[api]] \n" \
|
|
"bx lr \n" \
|
|
: \
|
|
: [tls] "J"(TLS_SLOT_OPENGL_API*4), \
|
|
[api] "J"(__builtin_offsetof(gl_hooks_t, gl._api)) \
|
|
: \
|
|
);
|
|
|
|
#define CALL_GL_API_RETURN(_api, ...) \
|
|
CALL_GL_API(_api, __VA_ARGS__) \
|
|
return 0; // placate gcc's warnings. never reached.
|
|
|
|
#else
|
|
|
|
#if CHECK_FOR_GL_ERRORS
|
|
|
|
#define CHECK_GL_ERRORS(_api) \
|
|
do { GLint err = glGetError(); \
|
|
LOGE_IF(err != GL_NO_ERROR, "%s failed (0x%04X)", #_api, err); \
|
|
} while(false);
|
|
|
|
#else
|
|
|
|
#define CHECK_GL_ERRORS(_api) do { } while(false);
|
|
|
|
#endif
|
|
|
|
|
|
#define API_ENTRY(_api) _api
|
|
|
|
#define CALL_GL_API(_api, ...) \
|
|
gl_hooks_t::gl_t const * const _c = &getGlThreadSpecific()->gl; \
|
|
_c->_api(__VA_ARGS__); \
|
|
CHECK_GL_ERRORS(_api)
|
|
|
|
#define CALL_GL_API_RETURN(_api, ...) \
|
|
gl_hooks_t::gl_t const * const _c = &getGlThreadSpecific()->gl; \
|
|
return _c->_api(__VA_ARGS__)
|
|
|
|
#endif
|
|
|
|
|
|
extern "C" {
|
|
#include "gl_api.in"
|
|
#include "glext_api.in"
|
|
}
|
|
|
|
#undef API_ENTRY
|
|
#undef CALL_GL_API
|
|
#undef CALL_GL_API_RETURN
|
|
|
|
|
|
/*
|
|
* These GL calls are special because they need to EGL to retrieve some
|
|
* informations before they can execute.
|
|
*/
|
|
|
|
extern "C" void __glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image);
|
|
extern "C" void __glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);
|
|
|
|
|
|
void glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)
|
|
{
|
|
GLeglImageOES implImage =
|
|
(GLeglImageOES)egl_get_image_for_current_context((EGLImageKHR)image);
|
|
__glEGLImageTargetTexture2DOES(target, implImage);
|
|
}
|
|
|
|
void glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
|
|
{
|
|
GLeglImageOES implImage =
|
|
(GLeglImageOES)egl_get_image_for_current_context((EGLImageKHR)image);
|
|
__glEGLImageTargetRenderbufferStorageOES(target, image);
|
|
}
|
|
|