projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vbo: if 'end' is out of bounds, clamp it
[mesa.git]
/
progs
/
egl
/
demo1.c
diff --git
a/progs/egl/demo1.c
b/progs/egl/demo1.c
index 49b6624538832aa34e407101ee6e0444f9ca5d29..34a516e72fcfe2876b60467eedd928d0cb357640 100644
(file)
--- a/
progs/egl/demo1.c
+++ b/
progs/egl/demo1.c
@@
-34,14
+34,9
@@
TestScreens(EGLDisplay dpy)
* Print table of all available configurations.
*/
static void
* Print table of all available configurations.
*/
static void
-PrintConfigs(EGLDisplay d)
+PrintConfigs(EGLDisplay d
, EGLConfig *configs, EGLint numConfigs
)
{
{
- EGLConfig *configs;
- EGLint numConfigs, i;
-
- eglGetConfigs(d, NULL, 0, &numConfigs);
- configs = malloc(sizeof(*configs) *numConfigs);
- eglGetConfigs(d, configs, numConfigs, &numConfigs);
+ EGLint i;
printf("Configurations:\n");
printf(" bf lv d st colorbuffer dp st supported \n");
printf("Configurations:\n");
printf(" bf lv d st colorbuffer dp st supported \n");
@@
-83,7
+78,6
@@
PrintConfigs(EGLDisplay d)
red, green, blue, alpha,
depth, stencil, surfString);
}
red, green, blue, alpha,
depth, stencil, surfString);
}
- free(configs);
}
}
@@
-94,7
+88,8
@@
main(int argc, char *argv[])
int maj, min;
EGLContext ctx;
EGLSurface pbuffer;
int maj, min;
EGLContext ctx;
EGLSurface pbuffer;
- EGLConfig configs[10];
+ EGLConfig *configs;
+ EGLint numConfigs;
EGLBoolean b;
const EGLint pbufAttribs[] = {
EGL_WIDTH, 500,
EGLBoolean b;
const EGLint pbufAttribs[] = {
EGL_WIDTH, 500,
@@
-102,10
+97,7
@@
main(int argc, char *argv[])
EGL_NONE
};
EGL_NONE
};
- /*
EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
- */
- EGLDisplay d = eglGetDisplay((EGLNativeDisplayType) "!EGL_i915");
assert(d);
if (!eglInitialize(d, &maj, &min)) {
assert(d);
if (!eglInitialize(d, &maj, &min)) {
@@
-116,7
+108,11
@@
main(int argc, char *argv[])
printf("EGL version = %d.%d\n", maj, min);
printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR));
printf("EGL version = %d.%d\n", maj, min);
printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR));
- PrintConfigs(d);
+ eglGetConfigs(d, NULL, 0, &numConfigs);
+ configs = malloc(sizeof(*configs) *numConfigs);
+ eglGetConfigs(d, configs, numConfigs, &numConfigs);
+
+ PrintConfigs(d, configs, numConfigs);
ctx = eglCreateContext(d, configs[0], EGL_NO_CONTEXT, NULL);
if (ctx == EGL_NO_CONTEXT) {
ctx = eglCreateContext(d, configs[0], EGL_NO_CONTEXT, NULL);
if (ctx == EGL_NO_CONTEXT) {
@@
-130,6
+126,8
@@
main(int argc, char *argv[])
return 0;
}
return 0;
}
+ free(configs);
+
b = eglMakeCurrent(d, pbuffer, pbuffer, ctx);
if (!b) {
printf("make current failed\n");
b = eglMakeCurrent(d, pbuffer, pbuffer, ctx);
if (!b) {
printf("make current failed\n");