Nux

Merge lp:~nux-team/nux/nux.fixed-texture-copy-blur into lp:nux

  1. nux.fixed-texture-copy-blur
  2. Merge into trunk
Proposed by Eleni Maria Stea
Status: Merged
Approved by: Jay Taoko
Approved revision: 725
Merged at revision: 725
Proposed branch: lp:~nux-team/nux/nux.fixed-texture-copy-blur
Merge into: lp:nux
Diff against target: 52 lines (+5/-4)
2 files modified
gputests/texture_blur.cpp (+1/-2)
gputests/texture_copy_blur.cpp (+4/-2)
To merge this branch: bzr merge lp:~nux-team/nux/nux.fixed-texture-copy-blur
Reviewer Review Type Date Requested Status
Jay Taoko (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+136949@code.launchpad.net

Commit message

* fixed gputests/texture_copy_blur example (swap buffers was missing)
* Removed some printf

Description of the change

* fixed gputests/texture_copy_blur example (swap buffers was missing)
* Removed some printf

To post a comment you must log in.
lp:~nux-team/nux/nux.fixed-texture-copy-blur updated
725. By Eleni Maria Stea

fixed gputests/texture_copy_blur.cpp (swap buffer was missing)

Revision history for this message
Jay Taoko (jaytaoko) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gputests/texture_blur.cpp'
2--- gputests/texture_blur.cpp 2012-10-15 05:05:27 +0000
3+++ gputests/texture_blur.cpp 2012-11-29 15:21:24 +0000
4@@ -127,14 +127,13 @@
5
6 nux::TexCoordXForm texxform;
7 //Make a blurred copy of the previous render target
8- printf("exec 0\n");
9+
10 if (texture_rt.IsValid() && graphics_engine)
11 {
12 tex_blur = graphics_engine->QRP_GLSL_GetBlurTexture(
13 0, 0, texture_rt->GetWidth(), texture_rt->GetHeight(),
14 texture_rt, texxform, nux::color::White, 7.0f);
15 }
16- printf("exec 1\n");
17
18 graphics_engine->QRP_1Tex(0, 0, tex_blur->GetWidth(), tex_blur->GetHeight(), tex_blur, texxform, nux::color::White);
19
20
21=== modified file 'gputests/texture_copy_blur.cpp'
22--- gputests/texture_copy_blur.cpp 2012-10-14 01:00:34 +0000
23+++ gputests/texture_copy_blur.cpp 2012-11-29 15:21:24 +0000
24@@ -26,7 +26,7 @@
25 #include "NuxGraphics/GraphicsEngine.h"
26
27 /*
28- * Tests:
29+ * Tests:
30 * - Frame buffer object
31 * - Set a texture in the fbo
32 * - Set fbo as a render target
33@@ -91,9 +91,10 @@
34 fbo = graphics_display->GetGpuDevice ()->CreateFrameBufferObject ();
35 texture_rt = graphics_display->GetGpuDevice ()->CreateSystemCapableDeviceTexture (graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), 1, nux::BITFMT_R8G8B8A8);
36 depth_rt = graphics_display->GetGpuDevice ()->CreateSystemCapableDeviceTexture (graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), 1, nux::BITFMT_D24S8);
37- fbo->FormatFrameBufferObject (graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), nux::BITFMT_R8G8B8A8);
38 }
39
40+ fbo->FormatFrameBufferObject (graphics_display->GetWindowWidth(), graphics_display->GetWindowHeight(), nux::BITFMT_R8G8B8A8);
41+
42 fbo->SetRenderTarget (0, texture_rt->GetSurfaceLevel (0));
43 fbo->SetDepthSurface (depth_rt->GetSurfaceLevel (0));
44 fbo->Activate();
45@@ -150,6 +151,7 @@
46 }
47 */
48
49+ graphics_display->SwapBuffer();
50 } while((event.type != nux::NUX_TERMINATE_APP) && (event.GetVirtualKeyState(NUX_VK_ESCAPE) == 0));
51
52 fbo.Release ();

Subscribers

People subscribed via source and target branches