Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 78059337: Merge change 25523 into eclair

Browse Source 
Merge commit '7805933738de33b1961bd03553237a86d90792dd' into eclair-plus-aosp

* commit '7805933738de33b1961bd03553237a86d90792dd':
  Add additional error checking, exit early if errors occur.
This commit is contained in:
Jack Palevich
2009-09-17 11:06:54 -07:00
committed by Android Git Automerger
parent 5c06347996 7805933738
commit 6d3179332d
1 changed files with 59 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
opengl/tests/gl2_basic/gl2_basic.cpp
View File

@@ -34,14 +34,16 @@ using namespace android;
static void printGLString(const char *name, GLenum s) static void printGLString(const char *name, GLenum s)
{ {
fprintf(stderr, "printGLString %s, %d\n", name, s); fprintf(stderr, "printGLString %s, %d\n", name, s);
#if 0 // causes hangs
const char *v = (const char *)glGetString(s); const char *v = (const char *)glGetString(s);
int error = glGetError(); int error = glGetError();
fprintf(stderr, "glGetError() = %d, result of glGetString = %x\n", error, fprintf(stderr, "glGetError() = %d, result of glGetString = %x\n", error,
(unsigned int)v); (unsigned int)v);
if ((v < (const char*) 0) || (v > (const char*) 0x1000)) if ((v < (const char*) 0) || (v > (const char*) 0x10000))
fprintf(stderr, "GL %s = %s\n", name, v); fprintf(stderr, "GL %s = %s\n", name, v);
else else
fprintf(stderr, "GL %s = (null)\n", name); fprintf(stderr, "GL %s = (null) 0x%08x\n", name, (unsigned int) v);
#endif
} }
static const char* eglErrorToString[] = { static const char* eglErrorToString[] = {
@@ -61,7 +63,11 @@ static const char* eglErrorToString[] = {
"EGL_BAD_SURFACE" "EGL_BAD_SURFACE"
}; };
static void checkEglError(const char* op) { static void checkEglError(const char* op, EGLBoolean returnVal = EGL_TRUE) {
if (returnVal != EGL_TRUE) {
fprintf(stderr, "%s() returned %d\n", op, returnVal);
}
for(EGLint error = eglGetError(); for(EGLint error = eglGetError();
error != EGL_SUCCESS; error != EGL_SUCCESS;
error = eglGetError()) { error = eglGetError()) {
@@ -69,25 +75,30 @@ static void checkEglError(const char* op) {
if (error >= EGL_SUCCESS && error <= EGL_BAD_SURFACE) { if (error >= EGL_SUCCESS && error <= EGL_BAD_SURFACE) {
errorString = eglErrorToString[error - EGL_SUCCESS]; errorString = eglErrorToString[error - EGL_SUCCESS];
} }
fprintf(stderr, "%s() returned eglError %s (0x%x)\n", op, fprintf(stderr, "after %s() eglError %s (0x%x)\n", op,
errorString, error); errorString, error);
} }
} }
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
EGLBoolean returnValue;
EGLConfig configs[2];
EGLint config_count;
EGLint context_attribs[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
EGLint s_configAttribs[] = { EGLint s_configAttribs[] = {
EGL_SURFACE_TYPE, EGL_WINDOW_BIT, EGL_BUFFER_SIZE, EGL_DONT_CARE,
EGL_RED_SIZE, 5, EGL_RED_SIZE, 5,
EGL_GREEN_SIZE, 6, EGL_GREEN_SIZE, 6,
EGL_BLUE_SIZE, 5, EGL_BLUE_SIZE, 5,
EGL_NONE EGL_DEPTH_SIZE, 8,
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
EGL_NONE
}; };
EGLint numConfigs = -1;
EGLint majorVersion; EGLint majorVersion;
EGLint minorVersion; EGLint minorVersion;
EGLConfig config;
EGLContext context; EGLContext context;
EGLSurface surface; EGLSurface surface;
EGLint w, h; EGLint w, h;
@@ -100,20 +111,50 @@ int main(int argc, char** argv)
checkEglError("<init>"); checkEglError("<init>");
dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY); dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);
checkEglError("eglGetDisplay"); checkEglError("eglGetDisplay");
eglInitialize(dpy, &majorVersion, &minorVersion); if (dpy == EGL_NO_DISPLAY) {
checkEglError("eglInitialize"); printf("eglGetDisplay returned EGL_NO_DISPLAY.\n");
return 0;
}
returnValue = eglInitialize(dpy, &majorVersion, &minorVersion);
checkEglError("eglInitialize", returnValue);
fprintf(stderr, "EGL version %d.%d\n", majorVersion, minorVersion); fprintf(stderr, "EGL version %d.%d\n", majorVersion, minorVersion);
returnValue = eglGetConfigs (dpy, configs, 2, &config_count);
checkEglError("eglGetConfigs", returnValue);
fprintf(stderr, "Config count: %d\n", config_count);
for(int i = 0; i < config_count; i++) {
fprintf(stderr, "%d: 0x%08x\n", i, (unsigned int) configs[i]);
}
#if 0
EGLConfig config;
EGLUtils::selectConfigForNativeWindow(dpy, s_configAttribs, window, &config); EGLUtils::selectConfigForNativeWindow(dpy, s_configAttribs, window, &config);
fprintf(stderr, "Chosen config: 0x%08x\n", (unsigned long) config);
checkEglError("EGLUtils::selectConfigForNativeWindow"); checkEglError("EGLUtils::selectConfigForNativeWindow");
surface = eglCreateWindowSurface(dpy, config, window, NULL); #else
checkEglError("eglCreateWindowSurface"); int chooseConfigResult = eglChooseConfig(dpy, s_configAttribs, configs, 2, &config_count);
checkEglError("eglChooseConfig", chooseConfigResult);
if (chooseConfigResult != EGL_TRUE )
{
printf("eglChooseConfig failed\n");
return 0;
}
#endif
surface = eglCreateWindowSurface(dpy, configs[0], window, NULL);
checkEglError("eglCreateWindowSurface");
if (surface == EGL_NO_SURFACE)
{
printf("gelCreateWindowSurface failed.\n");
return 0;
}
EGLint gl2_0Attribs[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE}; EGLint gl2_0Attribs[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
context = eglCreateContext(dpy, config, NULL, gl2_0Attribs); context = eglCreateContext(dpy, configs[0], EGL_NO_CONTEXT, context_attribs);
checkEglError("eglCreateContext"); checkEglError("eglCreateContext");
if (context == EGL_NO_CONTEXT)
{
printf("eglCreateContext failed\n");
return 0;
}
eglMakeCurrent(dpy, surface, surface, context); eglMakeCurrent(dpy, surface, surface, context);
checkEglError("eglMakeCurrent"); checkEglError("eglMakeCurrent");
eglQuerySurface(dpy, surface, EGL_WIDTH, &w); eglQuerySurface(dpy, surface, EGL_WIDTH, &w);