libgui: Recognize BMP images; fixed instanced drawing of ModelDrawable

Model instances still don't support rendering passes, though.
skyjake · Sep 1, 2019 · 4945367 · 4945367
1 parent f9e0ae5
commit 4945367
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/doomsday/libs/gui/src/graphics/glbuffer.cpp b/doomsday/libs/gui/src/graphics/glbuffer.cpp
@@ -560,7 +560,15 @@ void GLBuffer::drawInstanced(GLBuffer const &instanceAttribs, duint first, dint
 {
 #if defined (DENG_HAVE_INSTANCES)
 
-    if (!isReady() || !instanceAttribs.isReady() || !GLProgram::programInUse()) return;
+    if (!isReady() || !instanceAttribs.isReady() || !GLProgram::programInUse())
+    {
+#if defined (DENG2_DEBUG)
+        qDebug() << "[GLBuffer] isReady:" << isReady()
+                 << "instAttr isReady:" << instanceAttribs.isReady()
+                 << "progInUse:" << GLProgram::programInUse();
+#endif
+        return;
+    }
 
     // Mark the current target changed.
     GLState::current().target().markAsChanged();

diff --git a/doomsday/libs/gui/src/graphics/image.cpp b/doomsday/libs/gui/src/graphics/image.cpp
@@ -990,7 +990,8 @@ bool Image::recognize(File const &file)
 {
     String const ext = file.extension().toLower();
     return (ext == ".tga"  || ext == ".pcx" || ext == ".png"  || ext == ".jpg" ||
-            ext == ".jpeg" || ext == ".gif" || ext == ".tiff" || ext == ".ico");
+            ext == ".jpeg" || ext == ".gif" || ext == ".tiff" || ext == ".ico" ||
+            ext == ".bmp");
 }
 
 } // namespace de
diff --git a/doomsday/libs/gui/src/graphics/modeldrawable.cpp b/doomsday/libs/gui/src/graphics/modeldrawable.cpp
@@ -1401,7 +1401,9 @@ DENG2_PIMPL(ModelDrawable)
 
         preDraw(animation);
         setDrawProgram(program);
+        drawProgram->beginUse();
         glData.materials.at(0)->buffer->drawInstanced(attribs);
+        drawProgram->endUse();
         postDraw();
     }