No-context texture constructor (OpenGL only for now)

include/boo/graphicsdev/GL.hpp

@@ -34,8 +34,9 @@ public:
 
     ITextureS* newStaticTexture(size_t width, size_t height, size_t mips, TextureFormat fmt,
                                 const void* data, size_t sz);
-    ITextureS* newStaticTexture(size_t width, size_t height, size_t mips, TextureFormat fmt,
+    GraphicsDataToken
-                                std::unique_ptr<uint8_t[]>&& data, size_t sz);
+    newStaticTextureNoContext(size_t width, size_t height, size_t mips, TextureFormat fmt,
+                              const void* data, size_t sz, ITextureS** texOut);
     ITextureSA* newStaticArrayTexture(size_t width, size_t height, size_t layers, TextureFormat fmt,
                                       const void* data, size_t sz);
     ITextureD* newDynamicTexture(size_t width, size_t height, TextureFormat fmt);

include/boo/graphicsdev/IGraphicsDataFactory.hpp

@@ -201,9 +201,9 @@ struct IGraphicsDataFactory
     virtual ITextureS*
     newStaticTexture(size_t width, size_t height, size_t mips, TextureFormat fmt,
                      const void* data, size_t sz)=0;
-    virtual ITextureS*
+    virtual GraphicsDataToken
-    newStaticTexture(size_t width, size_t height, size_t mips, TextureFormat fmt,
+    newStaticTextureNoContext(size_t width, size_t height, size_t mips, TextureFormat fmt,
-                     std::unique_ptr<uint8_t[]>&& data, size_t sz)=0;
+                              const void* data, size_t sz, ITextureS** texOut)=0;
     virtual ITextureSA*
     newStaticArrayTexture(size_t width, size_t height, size_t layers, TextureFormat fmt,
                           const void* data, size_t sz)=0;

lib/graphicsdev/GL.cpp

@@ -133,6 +133,7 @@ class GLTextureS : public ITextureS
 
         GLenum intFormat, format;
         int pxPitch;
+        bool compressed = false;
         switch (fmt)
         {
         case TextureFormat::RGBA8:
@@ -145,10 +146,27 @@ class GLTextureS : public ITextureS
             format = GL_RED;
             pxPitch = 1;
             break;
+        case TextureFormat::DXT1:
+            intFormat = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
+            compressed = true;
+            break;
         default:
             Log.report(LogVisor::FatalError, "unsupported tex format");
         }
 
+        if (compressed)
+        {
+            for (size_t i=0 ; i<mips ; ++i)
+            {
+                size_t dataSz = width * height / 2;
+                glCompressedTexImage2D(GL_TEXTURE_2D, i, intFormat, width, height, 0, dataSz, dataIt);
+                dataIt += dataSz;
+                width /= 2;
+                height /= 2;
+            }
+        }
+        else
+        {
             for (size_t i=0 ; i<mips ; ++i)
             {
                 glTexImage2D(GL_TEXTURE_2D, i, intFormat, width, height, 0, format, GL_UNSIGNED_BYTE, dataIt);
@@ -157,6 +175,7 @@ class GLTextureS : public ITextureS
                 height /= 2;
             }
         }
+    }
 public:
     ~GLTextureS() {glDeleteTextures(1, &m_tex);}
 
@@ -270,16 +289,23 @@ GLDataFactory::newStaticTexture(size_t width, size_t height, size_t mips, Textur
     return retval;
 }
 
-ITextureS*
+GraphicsDataToken
-GLDataFactory::newStaticTexture(size_t width, size_t height, size_t mips, TextureFormat fmt,
+GLDataFactory::newStaticTextureNoContext(size_t width, size_t height, size_t mips, TextureFormat fmt,
-                                std::unique_ptr<uint8_t[]>&& data, size_t sz)
+                                         const void* data, size_t sz, ITextureS** texOut)
 {
-    std::unique_ptr<uint8_t[]> d = std::move(data);
+    GLTextureS* retval = new GLTextureS(width, height, mips, fmt, data, sz);
-    GLTextureS* retval = new GLTextureS(width, height, mips, fmt, d.get(), sz);
+    GLData* tokData = new struct GLData();
-    if (!m_deferredData.get())
+    tokData->m_STexs.emplace_back(retval);
-        m_deferredData.reset(new struct GLData());
+    *texOut = retval;
-    m_deferredData->m_STexs.emplace_back(retval);
+
-    return retval;
+    std::unique_lock<std::mutex> lk(m_committedMutex);
+    m_committedData.insert(tokData);
+    lk.unlock();
+    /* Let's go ahead and flush to ensure our data gets to the GPU
+       While this isn't strictly required, some drivers might behave
+       differently */
+    glFlush();
+    return GraphicsDataToken(this, tokData);
 }
 
 ITextureSA*
@@ -471,7 +497,7 @@ IShaderPipeline* GLDataFactory::newShaderPipeline
         {
             GLint uniLoc = glGetUniformBlockIndex(shader.m_prog, uniformBlockNames[i]);
             if (uniLoc < 0)
-                Log.report(LogVisor::FatalError, "unable to find uniform block '%s'", uniformBlockNames[i]);
+                Log.report(LogVisor::Error, "unable to find uniform block '%s'", uniformBlockNames[i]);
             shader.m_uniLocs.push_back(uniLoc);
         }
     }
@@ -480,12 +506,15 @@ IShaderPipeline* GLDataFactory::newShaderPipeline
     {
         GLint texLoc = glGetUniformLocation(shader.m_prog, texArrayName);
         if (texLoc < 0)
-            Log.report(LogVisor::FatalError, "unable to find sampler variable '%s'", texArrayName);
+            Log.report(LogVisor::Error, "unable to find sampler variable '%s'", texArrayName);
+        else
+        {
             if (texCount > m_texUnis.size())
                 for (size_t i=m_texUnis.size() ; i<texCount ; ++i)
                     m_texUnis.push_back(i);
             glUniform1iv(texLoc, m_texUnis.size(), m_texUnis.data());
         }
+    }
 
     GLShaderPipeline* retval = new GLShaderPipeline(std::move(shader));
     if (!m_deferredData.get())
@@ -611,6 +640,7 @@ GraphicsDataToken GLDataFactory::commit()
 #endif
     m_deferredData.reset();
     m_committedData.insert(retval);
+    lk.unlock();
     /* Let's go ahead and flush to ensure our data gets to the GPU
        While this isn't strictly required, some drivers might behave
        differently */