Nux

Merge lp:~nux-team/nux/nux.added-checkgl-tests into lp:nux

  1. nux.added-checkgl-tests
  2. Merge into trunk
Proposed by Eleni Maria Stea
Status: Merged
Approved by: Jay Taoko
Approved revision: 731
Merged at revision: 731
Proposed branch: lp:~nux-team/nux/nux.added-checkgl-tests
Merge into: lp:nux
Diff against target: 69 lines (+6/-6)
4 files modified
NuxGraphics/FreetypeFont.cpp (+2/-2)
NuxGraphics/IOpenGLRectangleTexture.cpp (+1/-1)
NuxGraphics/IOpenGLTexture2D.cpp (+1/-1)
gputests/texture_blur.cpp (+2/-2)
To merge this branch: bzr merge lp:~nux-team/nux/nux.added-checkgl-tests
Reviewer Review Type Date Requested Status
Jay Taoko (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+138477@code.launchpad.net

Commit message

* Added CHECKGL checks in every glGenTextures call

Description of the change

* Added CHECKGL checks in every glGenTextures call

To post a comment you must log in.
Revision history for this message
Jay Taoko (jaytaoko) wrote :

There is also one missing in IOpenGLRectangleTexture.cpp

review: Needs Fixing
Revision history for this message
Jay Taoko (jaytaoko) wrote :

Forget my previous comment. This branch is good to merge.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NuxGraphics/FreetypeFont.cpp'
2--- NuxGraphics/FreetypeFont.cpp 2012-11-17 23:09:33 +0000
3+++ NuxGraphics/FreetypeFont.cpp 2012-12-06 15:02:44 +0000
4@@ -202,7 +202,7 @@
5 /*image->width = font_bitmap_width;
6 image->Height() = font_bitmap_height;
7 image->bpp = 32;
8- image->data = imgp;*/
9+ image->data = imgp;*/
10
11 //unsigned char* buffer = new unsigned char[font_bitmap_width * font_bitmap_height];
12 //agg::rendering_buffer rbuf(buffer, font_bitmap_width, font_bitmap_height, font_bitmap_height*4);
13@@ -211,7 +211,7 @@
14
15 GLuint texname;
16 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
17- glGenTextures (1, &texname);
18+ CHECKGL(glGenTextures (1, &texname));
19 glBindTexture (GL_TEXTURE_2D, texname);
20
21 /* float *border_color = new float[4];
22
23=== modified file 'NuxGraphics/IOpenGLRectangleTexture.cpp'
24--- NuxGraphics/IOpenGLRectangleTexture.cpp 2012-09-26 06:44:12 +0000
25+++ NuxGraphics/IOpenGLRectangleTexture.cpp 2012-12-06 15:02:44 +0000
26@@ -38,7 +38,7 @@
27 #ifndef NUX_OPENGLES_20
28 if (Dummy == false)
29 {
30- glGenTextures(1, &_OpenGLID);
31+ CHECKGL(glGenTextures(1, &_OpenGLID));
32 CHECKGL(glBindTexture(GL_TEXTURE_RECTANGLE_ARB, _OpenGLID));
33 }
34
35
36=== modified file 'NuxGraphics/IOpenGLTexture2D.cpp'
37--- NuxGraphics/IOpenGLTexture2D.cpp 2012-09-26 06:44:12 +0000
38+++ NuxGraphics/IOpenGLTexture2D.cpp 2012-12-06 15:02:44 +0000
39@@ -36,7 +36,7 @@
40 external_id_ = Dummy;
41 if (external_id_ == false)
42 {
43- glGenTextures(1, &_OpenGLID);
44+ CHECKGL(glGenTextures(1, &_OpenGLID));
45 CHECKGL(glBindTexture(GL_TEXTURE_2D, _OpenGLID));
46 }
47
48
49=== modified file 'gputests/texture_blur.cpp'
50--- gputests/texture_blur.cpp 2012-11-29 15:18:37 +0000
51+++ gputests/texture_blur.cpp 2012-12-06 15:02:44 +0000
52@@ -26,7 +26,7 @@
53 #include "NuxGraphics/GraphicsEngine.h"
54
55 /*
56- * Tests:
57+ * Tests:
58 * - frame buffer object
59 * - Set a texture in the fbo
60 * - Set fbo as a render target
61@@ -35,7 +35,7 @@
62 * - Blur the render target texture
63 * - Render to default back buffer
64 */
65-
66+
67 void RenderBlurredTexture ()
68 {
69 nux::GraphicsDisplay* graphics_display = gGLWindowManager.CreateGLWindow("Window", 600, 300, nux::WINDOWSTYLE_NORMAL, 0, false);

Subscribers

People subscribed via source and target branches