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
=== modified file 'NuxGraphics/FreetypeFont.cpp'
--- NuxGraphics/FreetypeFont.cpp 2012-11-17 23:09:33 +0000
+++ NuxGraphics/FreetypeFont.cpp 2012-12-06 15:02:44 +0000
@@ -202,7 +202,7 @@
202 /*image->width = font_bitmap_width;202 /*image->width = font_bitmap_width;
203 image->Height() = font_bitmap_height;203 image->Height() = font_bitmap_height;
204 image->bpp = 32;204 image->bpp = 32;
205 image->data = imgp;*/205 image->data = imgp;*/
206206
207 //unsigned char* buffer = new unsigned char[font_bitmap_width * font_bitmap_height];207 //unsigned char* buffer = new unsigned char[font_bitmap_width * font_bitmap_height];
208 //agg::rendering_buffer rbuf(buffer, font_bitmap_width, font_bitmap_height, font_bitmap_height*4);208 //agg::rendering_buffer rbuf(buffer, font_bitmap_width, font_bitmap_height, font_bitmap_height*4);
@@ -211,7 +211,7 @@
211211
212 GLuint texname;212 GLuint texname;
213 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);213 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
214 glGenTextures (1, &texname);214 CHECKGL(glGenTextures (1, &texname));
215 glBindTexture (GL_TEXTURE_2D, texname);215 glBindTexture (GL_TEXTURE_2D, texname);
216216
217 /* float *border_color = new float[4];217 /* float *border_color = new float[4];
218218
=== modified file 'NuxGraphics/IOpenGLRectangleTexture.cpp'
--- NuxGraphics/IOpenGLRectangleTexture.cpp 2012-09-26 06:44:12 +0000
+++ NuxGraphics/IOpenGLRectangleTexture.cpp 2012-12-06 15:02:44 +0000
@@ -38,7 +38,7 @@
38#ifndef NUX_OPENGLES_2038#ifndef NUX_OPENGLES_20
39 if (Dummy == false)39 if (Dummy == false)
40 {40 {
41 glGenTextures(1, &_OpenGLID);41 CHECKGL(glGenTextures(1, &_OpenGLID));
42 CHECKGL(glBindTexture(GL_TEXTURE_RECTANGLE_ARB, _OpenGLID));42 CHECKGL(glBindTexture(GL_TEXTURE_RECTANGLE_ARB, _OpenGLID));
43 }43 }
4444
4545
=== modified file 'NuxGraphics/IOpenGLTexture2D.cpp'
--- NuxGraphics/IOpenGLTexture2D.cpp 2012-09-26 06:44:12 +0000
+++ NuxGraphics/IOpenGLTexture2D.cpp 2012-12-06 15:02:44 +0000
@@ -36,7 +36,7 @@
36 external_id_ = Dummy;36 external_id_ = Dummy;
37 if (external_id_ == false)37 if (external_id_ == false)
38 {38 {
39 glGenTextures(1, &_OpenGLID);39 CHECKGL(glGenTextures(1, &_OpenGLID));
40 CHECKGL(glBindTexture(GL_TEXTURE_2D, _OpenGLID));40 CHECKGL(glBindTexture(GL_TEXTURE_2D, _OpenGLID));
41 }41 }
4242
4343
=== modified file 'gputests/texture_blur.cpp'
--- gputests/texture_blur.cpp 2012-11-29 15:18:37 +0000
+++ gputests/texture_blur.cpp 2012-12-06 15:02:44 +0000
@@ -26,7 +26,7 @@
26#include "NuxGraphics/GraphicsEngine.h"26#include "NuxGraphics/GraphicsEngine.h"
2727
28/*28/*
29 * Tests: 29 * Tests:
30 * - frame buffer object30 * - frame buffer object
31 * - Set a texture in the fbo31 * - Set a texture in the fbo
32 * - Set fbo as a render target32 * - Set fbo as a render target
@@ -35,7 +35,7 @@
35 * - Blur the render target texture35 * - Blur the render target texture
36 * - Render to default back buffer36 * - Render to default back buffer
37 */37 */
38 38
39void RenderBlurredTexture ()39void RenderBlurredTexture ()
40{40{
41 nux::GraphicsDisplay* graphics_display = gGLWindowManager.CreateGLWindow("Window", 600, 300, nux::WINDOWSTYLE_NORMAL, 0, false);41 nux::GraphicsDisplay* graphics_display = gGLWindowManager.CreateGLWindow("Window", 600, 300, nux::WINDOWSTYLE_NORMAL, 0, false);

Subscribers

People subscribed via source and target branches