projects
/
gltest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
92d3b16
)
Remove some trailing spaces
author
Ralf Jung
<post@ralfj.de>
Wed, 3 Apr 2013 13:36:38 +0000
(15:36 +0200)
committer
Ralf Jung
<post@ralfj.de>
Wed, 3 Apr 2013 13:36:38 +0000
(15:36 +0200)
eglbackend.cpp
patch
|
blob
|
history
glxbackend.cpp
patch
|
blob
|
history
diff --git
a/eglbackend.cpp
b/eglbackend.cpp
index 04165c761460cedb93a6d99203a5b367a01381e4..ac7ab38d0f560950b5aabf7945f96660da8a996f 100644
(file)
--- a/
eglbackend.cpp
+++ b/
eglbackend.cpp
@@
-49,8
+49,7
@@
static void exitEglError(const char *what)
exit(1);
}
exit(1);
}
-/* attributes for a double buffered visual in RGBA format with at least
-* 4 bits per color */
+// attributes for a visual in RGBA format with at least 4 bits per color
static const EGLint config_attribs[] = {
EGL_RED_SIZE, 4,
EGL_GREEN_SIZE, 4,
static const EGLint config_attribs[] = {
EGL_RED_SIZE, 4,
EGL_GREEN_SIZE, 4,
@@
-65,16
+64,16
@@
VisualID EGLBackend::initialize(Display *xDisplay)
// get connection and bind API
EGLint eglMajor, eglMinor;
display = eglGetDisplay(xDisplay);
// get connection and bind API
EGLint eglMajor, eglMinor;
display = eglGetDisplay(xDisplay);
- if (display == EGL_NO_DISPLAY)
+ if (display == EGL_NO_DISPLAY)
exitEglError("Failed to get EGL display");
exitEglError("Failed to get EGL display");
- if (eglInitialize(display, &eglMajor, &eglMinor) == EGL_FALSE)
+ if (eglInitialize(display, &eglMajor, &eglMinor) == EGL_FALSE)
exitEglError("Failed to initialize EGL");
printf("Using EGL version %d.%d\n", eglMajor, eglMinor);
eglBindAPI(EGL_OPENGL_API);
// get an appropriate config
EGLConfig configs[1];
EGLint count;
exitEglError("Failed to initialize EGL");
printf("Using EGL version %d.%d\n", eglMajor, eglMinor);
eglBindAPI(EGL_OPENGL_API);
// get an appropriate config
EGLConfig configs[1];
EGLint count;
- if (eglChooseConfig(display, config_attribs, configs, 1, &count) == EGL_FALSE || count == 0)
+ if (eglChooseConfig(display, config_attribs, configs, 1, &count) == EGL_FALSE || count == 0)
exitEglError("Failed to choose config");
config = configs[0];
}
exitEglError("Failed to choose config");
config = configs[0];
}
@@
-88,7
+87,7
@@
void EGLBackend::createContext(Window window)
{
assert(display != EGL_NO_DISPLAY && context == EGL_NO_CONTEXT);
surface = eglCreateWindowSurface(display, config, window, NULL);
{
assert(display != EGL_NO_DISPLAY && context == EGL_NO_CONTEXT);
surface = eglCreateWindowSurface(display, config, window, NULL);
- /
* create an EGL context and use it with the surface */
+ /
/ create an EGL context and use it with the surface
context = eglCreateContext(display, config, EGL_NO_CONTEXT, NULL);
if (context == EGL_NO_CONTEXT)
exitEglError("Failed to create context");
context = eglCreateContext(display, config, EGL_NO_CONTEXT, NULL);
if (context == EGL_NO_CONTEXT)
exitEglError("Failed to create context");
diff --git
a/glxbackend.cpp
b/glxbackend.cpp
index 9f8ed3e257d5aac8ec10239ecd33b9934332028b..a957e5bfeb8963618ba87f00a34394c7b0dd9c95 100644
(file)
--- a/
glxbackend.cpp
+++ b/
glxbackend.cpp
@@
-24,15
+24,14
@@
#include <GL/glxext.h>
#include <string>
#include <GL/glxext.h>
#include <string>
-/* attributes for a double buffered visual in RGBA format with at least
-* 4 bits per color */
+// attributes for a double buffered visual in RGBA format with at least 4 bits per color
static int attrList[] =
static int attrList[] =
-{
+{
GLX_RGBA, GLX_DOUBLEBUFFER,
GLX_RGBA, GLX_DOUBLEBUFFER,
- GLX_RED_SIZE, 4,
- GLX_GREEN_SIZE, 4,
+ GLX_RED_SIZE, 4,
+ GLX_GREEN_SIZE, 4,
GLX_BLUE_SIZE, 4,
GLX_BLUE_SIZE, 4,
- None
+ None
};
VisualID GLXBackend::initialize(Display *display)
};
VisualID GLXBackend::initialize(Display *display)