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

Merge "option to enable multisampling" into gingerbread

Browse Source
This commit is contained in:
Mathias Agopian
2010-09-09 11:55:00 -07:00
committed by Android (Google) Code Review
parent e3692d153e 850753b6f4
commit fec5d38baf
1 changed files with 66 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
opengl/tests/angeles/app-linux.cpp
View File

@@ -88,7 +88,7 @@ const char *egl_strerror(unsigned err)
case EGL_BAD_NATIVE_WINDOW: return "BAD NATIVE WINDOW"; case EGL_BAD_NATIVE_WINDOW: return "BAD NATIVE WINDOW";
case EGL_BAD_PARAMETER: return "BAD PARAMETER"; case EGL_BAD_PARAMETER: return "BAD PARAMETER";
case EGL_BAD_SURFACE: return "BAD_SURFACE"; case EGL_BAD_SURFACE: return "BAD_SURFACE";
// case EGL_CONTEXT_LOST: return "CONTEXT LOST"; // case EGL_CONTEXT_LOST: return "CONTEXT LOST";
default: return "UNKNOWN"; default: return "UNKNOWN";
} }
} }
@@ -118,10 +118,12 @@ static void checkEGLErrors()
fprintf(stderr, "EGL Error: 0x%04x\n", (int)error); fprintf(stderr, "EGL Error: 0x%04x\n", (int)error);
} }
static int initGraphics() static int initGraphics(unsigned samples)
{ {
EGLint configAttribs[] = { EGLint configAttribs[] = {
EGL_DEPTH_SIZE, 16, EGL_DEPTH_SIZE, 16,
EGL_SAMPLE_BUFFERS, samples ? 1 : 0,
EGL_SAMPLES, samples,
EGL_NONE EGL_NONE
}; };
@@ -164,6 +166,11 @@ static int initGraphics()
sEglSurface = surface; sEglSurface = surface;
sEglContext = context; sEglContext = context;
if (samples == 0) {
// GL_MULTISAMPLE is enabled by default
glDisable(GL_MULTISAMPLE);
}
return EGL_TRUE; return EGL_TRUE;
} }
@@ -179,11 +186,14 @@ static void deinitGraphics()
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
// not referenced: unsigned samples = 0;
argc = argc; printf("usage: %s [samples]\n", argv[0]);
argv = argv; if (argc == 2) {
samples = atoi( argv[1] );
printf("Multisample enabled: GL_SAMPLES = %u\n", samples);
}
if (!initGraphics()) if (!initGraphics(samples))
{ {
fprintf(stderr, "Graphics initialization failed.\n"); fprintf(stderr, "Graphics initialization failed.\n");
return EXIT_FAILURE; return EXIT_FAILURE;