Changeset 1771Tweet

Timestamp:

Aug 18, 2012, 5:49:40 PM (11 years ago)

Author:

sam

Message:

gpu: get rid of the glClearColor, glClearDepth and glClear calls in all
projects, we now use Video::SetClearColor, Video::SetClearDepth and
Video::Clear instead, so that the Direct3D equivalents can be called.

Location:

trunk

Files:

• src/ticker.cpp (modified) (1 diff)
• src/video.cpp (modified) (5 diffs)
• src/video.h (modified) (2 diffs)
• tools/neercs/video/render.cpp (modified) (1 diff)
• tutorial/08_fbo.cpp (modified) (3 diffs)

trunk/src/ticker.cpp

@@ -363 +363 @@
         case Entity::DRAWGROUP_BEGIN:
             Scene::GetDefault()->Reset();
-            Video::Clear();
+            Video::Clear(ClearMask::All);
             break;
         case Entity::DRAWGROUP_HUD:

trunk/src/video.cpp

@@ -52 +52 @@
     static mat4 proj_matrix;
     static ivec2 saved_viewport;
-#if defined USE_D3D9
+#if defined USE_D3D9 || defined _XBOX
+#   if defined USE_D3D9
     static IDirect3D9 *d3d_ctx;
     static IDirect3DDevice9 *d3d_dev;
-    static D3DCOLOR clear_color;
-#elif defined _XBOX
+#   elif defined _XBOX
     static Direct3D *d3d_ctx;
     static D3DDevice *d3d_dev;
+#   endif
     static D3DCOLOR clear_color;
+    static float clear_depth;
 #endif
 };
@@ -66 +68 @@
 ivec2 VideoData::saved_viewport(0, 0);
 
-#if defined USE_D3D9
+#if defined USE_D3D9 || defined _XBOX
+#   if defined USE_D3D9
 IDirect3D9 *VideoData::d3d_ctx;
 IDirect3DDevice9 *VideoData::d3d_dev;
-D3DCOLOR VideoData::clear_color;
-#elif defined _XBOX
+#   elif defined _XBOX
 Direct3D *VideoData::d3d_ctx;
 D3DDevice *VideoData::d3d_dev;
+#   endif
 D3DCOLOR VideoData::clear_color;
+float VideoData::clear_depth;
 #endif
 
@@ -108 +112 @@
     VideoData::saved_viewport = size;
 
-    VideoData::clear_color = D3DCOLOR_XRGB(26, 51, 77);
-
     d3dpp.BackBufferWidth = size.x;
     d3dpp.BackBufferHeight = size.y;
@@ -144 +146 @@
     VideoData::saved_viewport = size;
 
-    glClearColor(0.1f, 0.2f, 0.3f, 1.0f);
-    glClearDepth(1.0);
-
 #   if defined HAVE_GL_2X && !defined __APPLE__
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 #   endif
 #endif
+
+    /* Initialise reasonable scene default properties */
+    SetClearColor(vec4(0.1f, 0.2f, 0.3f, 1.0f));
+    SetClearDepth(1.f);
 }
 
@@ -219 +222 @@
 }
 
-void Video::Clear()
-{
+void Video::SetClearDepth(float f)
+{
+#if defined USE_D3D9 || defined _XBOX
+    VideoData::clear_depth = f;
+#else
+    glClearDepth(f);
+#endif
+}
+
+void Video::Clear(ClearMask m)
+{
+#if defined USE_D3D9 || defined _XBOX
+    /* Note: D3D9 doesn't appear to support the accumulation buffer. */
+    int mask = 0;
+    if (m & ClearMask::Color)
+        mask |= D3DCLEAR_TARGET;
+    if (m & ClearMask::Depth)
+        mask |= D3DCLEAR_ZBUFFER;
+    if (m & ClearMask::Stencil)
+        mask |= D3DCLEAR_STENCIL;
+    if (FAILED(VideoData::d3d_dev->Clear(0, NULL, mask,
+                                         VideoData::clear_color,
+                                         VideoData::clear_depth, 0)))
+        Abort();
+#else
+    /* FIXME: is this necessary here? */
     ivec2 size = GetSize();
-#if defined USE_D3D9 || defined _XBOX
-    if (FAILED(VideoData::d3d_dev->Clear(0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER
-                                        | D3DCLEAR_STENCIL,
-                              VideoData::clear_color, 1.0f, 0)))
-        Abort();
-#else
     glViewport(0, 0, size.x, size.y);
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+
+    GLbitfield mask = 0;
+    if (m & ClearMask::Color)
+        mask |= GL_COLOR_BUFFER_BIT;
+    if (m & ClearMask::Depth)
+        mask |= GL_DEPTH_BUFFER_BIT;
+    if (m & ClearMask::Accum)
+        mask |= GL_ACCUM_BUFFER_BIT;
+    if (m & ClearMask::Stencil)
+        mask |= GL_STENCIL_BUFFER_BIT;
+    glClear(mask);
 #endif
 

trunk/src/video.h

@@ -23 +23 @@
 {
 
+struct ClearMask
+{
+    enum Value
+    {
+        Color   = 1 << 0,
+        Depth   = 1 << 1,
+        Accum   = 1 << 2,
+        Stencil = 1 << 3,
+
+        All     = 0xffffffff
+    }
+    m_value;
+
+    inline ClearMask(Value v) { m_value = v; }
+    inline ClearMask(uint64_t i) { m_value = (Value)i; }
+    inline operator Value() { return m_value; }
+};
+
 class Video
 {
@@ -31 +49 @@
     static void SetDepth(bool set);
     static void SetClearColor(vec4 color);
-    static void Clear();
+    static void SetClearDepth(float f);
+    static void Clear(ClearMask m);
     static void Capture(uint32_t *buffer);
     static ivec2 GetSize();

trunk/tools/neercs/video/render.cpp

@@ -819 +819 @@
     /* Clear the back buffer */
     glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_COLOR,GL_DST_ALPHA);
-    glClearColor(screen_color.r, screen_color.g, screen_color.b, 1.0f);
-    glClearDepth(1.0f); // set depth buffer
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glBlendFunc(GL_SRC_COLOR, GL_DST_ALPHA);
+
+    Video::SetClearColor(vec4(screen_color, 1.f));
+    Video::SetClearDepth(1.0f); // set depth buffer
+    Video::Clear(ClearMask::Color | ClearMask::Depth);
 
     text_render->Blit(border, canvas_size);

trunk/tutorial/08_fbo.cpp

@@ -15 +15 @@
 #include "core.h"
 #include "loldebug.h"
-#include "lolgl.h"
 
 using namespace std;
@@ -78 +77 @@
             m_fbo = new FrameBuffer(Video::GetSize());
             m_fbo->Bind();
-            glClearColor(0.0, 0.0, 0.0, 1.0f);
-            glClearDepth(1.0f);
-            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+            Video::SetClearColor(vec4(0.f, 0.f, 0.f, 1.f));
+            Video::SetClearDepth(1.f);
+            Video::Clear(ClearMask::Color | ClearMask::Depth);
             m_fbo->Unbind();
 
@@ -90 +89 @@
         m_fbo->Bind();
         /* FIXME: we should just disable depth test in the shader */
-        glClear(GL_DEPTH_BUFFER_BIT);
+        Video::Clear(ClearMask::Depth);
         m_shader->Bind();
         m_shader->SetUniform(m_uni_flag, 0.f);