Nux

Merge lp:~3v1n0/nux/fix-depth-texture-initialization into lp:nux/raring

  1. fix-depth-texture-initialization
  2. Merge into raring
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Eleni Maria Stea
Approved revision: 780
Merged at revision: 779
Proposed branch: lp:~3v1n0/nux/fix-depth-texture-initialization
Merge into: lp:nux/raring
Diff against target: 48 lines (+5/-4)
3 files modified
Nux/WindowCompositor.h (+1/-0)
NuxGraphics/RenderingPipeAsm.cpp (+3/-2)
NuxGraphics/RenderingPipeGLSL.cpp (+1/-2)
To merge this branch: bzr merge lp:~3v1n0/nux/fix-depth-texture-initialization
Reviewer Review Type Date Requested Status
Eleni Maria Stea (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+161765@code.launchpad.net

Commit message

RenderingPipe: always use the depth buffer texture when getting the CopyTexture

Description of the change

Backporting to raring lp:~3v1n0/nux/fix-depth-texture-initialization/+merge/161762

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:780
http://jenkins.qa.ubuntu.com/job/nux-raring-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-raring-raring-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-raring-raring-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-raring-raring-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-raring-ci/2/rebuild

review: Approve (continuous-integration)
Revision history for this message
Eleni Maria Stea (hikiko) wrote :

It works! Cool solution! Bravo!! :DDD

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Nux/WindowCompositor.h'
2--- Nux/WindowCompositor.h 2012-11-27 17:18:13 +0000
3+++ Nux/WindowCompositor.h 2013-05-01 01:33:25 +0000
4@@ -213,6 +213,7 @@
5 int dnd_safety_x_;
6 int dnd_safety_y_;
7
8+ public:
9 /*!
10 This signal is similar to Area::key_nav_focus_change. It is emitted from the WindowCompositor.
11 The user only needs to listen to this signal to find out the area that has received the keyboard focus.\n
12
13=== modified file 'NuxGraphics/RenderingPipeAsm.cpp'
14--- NuxGraphics/RenderingPipeAsm.cpp 2012-11-05 21:31:06 +0000
15+++ NuxGraphics/RenderingPipeAsm.cpp 2013-05-01 01:33:25 +0000
16@@ -1966,6 +1966,8 @@
17 SetViewport(0, 0, previous_width, previous_height);
18 }
19
20+ SetOrthographicProjectionMatrix(previous_width, previous_height);
21+
22 return _offscreen_color_rt0;
23 }
24
25@@ -2478,8 +2480,7 @@
26 }
27
28 CHECKGL(glClearColor(0, 0, 0, 0));
29- ObjectPtr<IOpenGLBaseTexture> depth_buffer(NULL);
30- SetFrameBufferHelper(_offscreen_fbo, dst_device_texture, depth_buffer, width, height);
31+ SetFrameBufferHelper(_offscreen_fbo, dst_device_texture, _offscreen_depth_rt0, width, height);
32 CHECKGL(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT));
33
34 QRP_ASM_1Tex(0, 0, width, height, src_device_texture, texxform0, c0);
35
36=== modified file 'NuxGraphics/RenderingPipeGLSL.cpp'
37--- NuxGraphics/RenderingPipeGLSL.cpp 2012-11-28 16:44:59 +0000
38+++ NuxGraphics/RenderingPipeGLSL.cpp 2013-05-01 01:33:25 +0000
39@@ -3166,8 +3166,7 @@
40 }
41
42 CHECKGL(glClearColor(0, 0, 0, 0));
43- ObjectPtr<IOpenGLBaseTexture> depth_buffer(NULL);
44- SetFrameBufferHelper(_offscreen_fbo, dst_device_texture, depth_buffer, width, height);
45+ SetFrameBufferHelper(_offscreen_fbo, dst_device_texture, _offscreen_depth_rt0, width, height);
46 CHECKGL(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT));
47
48 QRP_GLSL_1Tex(0, 0, width, height, src_device_texture, texxform0, c0);

Subscribers

People subscribed via source and target branches