Added Surface type - as a simple value type to hold a 2d collection of pixels. (#548)

Added PngSerializeUtil allows currently for just writing Surface of RGBA format.
Removes dependency on stbi_image except for in PngSerializeUtil.
Removed use of gWindowWidth/Height globals - pass the height into initialize or Renderer.

1 files changed, 14 insertions, 45 deletions

diff --git a/tools/render-test/render-gl.cpp b/tools/render-test/render-gl.cpp
index b079d3f10..cef482798 100644
--- a/tools/render-test/render-gl.cpp
+++ b/tools/render-test/render-gl.cpp
@@ -11,6 +11,9 @@
 #include "core/secure-crt.h"
 #include "external/stb/stb_image_write.h"
 
+#include "surface.h"
+#include "png-serialize-util.h"
+
 // TODO(tfoley): eventually we should be able to run these
 // tests on non-Windows targets to confirm that cross-compilation
 // at least *works* on those platforms...
@@ -78,7 +81,7 @@ class GLRenderer : public Renderer, public ShaderCompiler
 public:
     
     // Renderer    implementation
-    virtual SlangResult initialize(void* inWindowHandle) override;
+    virtual SlangResult initialize(const Desc& desc, void* inWindowHandle) override;
     virtual void setClearColor(const float color[4]) override;
     virtual void clearFrame() override;
     virtual void presentFrame() override;
@@ -276,6 +279,8 @@ public:
     UInt    m_boundVertexStreamStrides[kMaxVertexStreams];
     UInt    m_boundVertexStreamOffsets[kMaxVertexStreams];
 
+    Desc m_desc;
+
     // Declare a function pointer for each OpenGL
     // extension function we need to load
 #define DECLARE_GL_EXTENSION_FUNC(NAME, TYPE) TYPE NAME;
@@ -520,9 +525,10 @@ void GLRenderer::destroyBindingEntries(const BindingState::Desc& desc, const Bin
 
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!! Renderer interface !!!!!!!!!!!!!!!!!!!!!!!!!!
 
-SlangResult GLRenderer::initialize(void* inWindowHandle)
+SlangResult GLRenderer::initialize(const Desc& desc, void* inWindowHandle)
 {
     auto windowHandle = (HWND)inWindowHandle;
+    m_desc = desc;
 
     m_hdc = ::GetDC(windowHandle);
 
@@ -553,7 +559,7 @@ SlangResult GLRenderer::initialize(void* inWindowHandle)
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_CULL_FACE);
 
-    glViewport(0, 0, gWindowWidth, gWindowHeight);
+    glViewport(0, 0, desc.width, desc.height);
 
     if (glDebugMessageCallback)
     {
@@ -582,48 +588,11 @@ void GLRenderer::presentFrame()
 
 SlangResult GLRenderer::captureScreenShot(const char* outputPath)
 {
-    int width = gWindowWidth;
-    int height = gWindowHeight;
-
-    int components = 4;
-    int rowStride = width*components;
-
-    GLubyte* buffer = (GLubyte*)::malloc(components * width * height);
-
-    glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
-
-    // OpenGL's "upside down" convention bites us here, so we need
-    // to flip the data in the buffer by swapping rows
-    int halfHeight = height / 2;
-    for (int hh = 0; hh < halfHeight; ++hh)
-    {
-        // Get a pointer to the row data, and a pointer
-        // to the row on the "other end" of the image
-        GLubyte* rowA = buffer + rowStride*hh;
-        GLubyte* rowB = buffer + rowStride*(height - (hh + 1));
-
-        for (int ii = 0; ii < rowStride; ++ii)
-        {
-            auto a = rowA[ii];
-            auto b = rowB[ii];
-
-            rowA[ii] = b;
-            rowB[ii] = a;
-        }
-    }
-
-    //
-    int stbResult = stbi_write_png(outputPath, width, height, components, buffer, rowStride);
-
-    ::free(buffer);
-
-    if (!stbResult)
-    {
-        assert(!"unexpected");
-        return SLANG_FAIL;
-    }
-
-    return SLANG_OK;
+    Surface surface;
+    surface.allocate(m_desc.width, m_desc.height, Format::RGBA_Unorm_UInt8, 1, SurfaceAllocator::getMallocAllocator());
+    glReadPixels(0, 0, m_desc.width, m_desc.height, GL_RGBA, GL_UNSIGNED_BYTE, surface.m_data);
+    surface.flipInplaceVertically();
+    return PngSerializeUtil::write(outputPath, surface);
 }
 
 ShaderCompiler* GLRenderer::getShaderCompiler()