Use GL_RGBA8 for atlas texture format, and minor tidy up

wheybags · Mar 17, 2019 · 8ce51e6 · 8ce51e6
1 parent 617c032
commit 8ce51e6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/apps/freeablo/farender/spritecache.cpp b/apps/freeablo/farender/spritecache.cpp
@@ -257,7 +257,7 @@ namespace FARender
 
     void SpriteCache::evict()
     {
-        if (!Render::SpriteGroup::canDelete())
+        if (!Render::SpriteGroup::canDeleteSprites())
             return;
 
         std::list<uint32_t>::reverse_iterator it;
@@ -282,7 +282,7 @@ namespace FARender
 
     void SpriteCache::clear()
     {
-        if (!Render::SpriteGroup::canDelete())
+        if (!Render::SpriteGroup::canDeleteSprites())
             return;
 
         for (std::list<uint32_t>::iterator it = mUsedList.begin(); it != mUsedList.end(); it++)

diff --git a/components/render/atlastexture.cpp b/components/render/atlastexture.cpp
@@ -48,10 +48,9 @@ namespace Render
             // Allocate memory for texture array (by passing NULL).
             // NOTE: For GL_COMPRESSED_RGBA image dimensions need to be padded to a
             // multiple/alignment of 4: https://forums.khronos.org/showthread.php/77554
-            // Also may need to clear texture if there are
             glTexImage2D(GL_TEXTURE_2D,
                          0,
-                         /*GL_RGBA8*/ GL_RGB5_A1 /*GL_COMPRESSED_RGBA*/,
+                         /*GL_RGB5_A1*/ GL_RGBA8 /*GL_COMPRESSED_RGBA*/,
                          mTextureWidth,
                          mTextureHeight,
                          0,

diff --git a/components/render/misc.h b/components/render/misc.h
@@ -15,7 +15,7 @@ namespace Render
     public:
         SpriteGroup(const std::string& path);
         SpriteGroup(const std::vector<Sprite> sprites) : mSprites(sprites), mAnimLength(sprites.size()) {}
-        static bool canDelete();
+        static bool canDeleteSprites();
         void destroy();
 
         Sprite& operator[](size_t index);

diff --git a/components/render/sdl2backend.cpp b/components/render/sdl2backend.cpp
@@ -14,6 +14,7 @@
 #include "../cel/celframe.h"
 
 #include "../level/level.h"
+#include <boost/make_unique.hpp>
 #include <faio/fafileobject.h>
 #include <misc/assert.h>
 #include <misc/savePNG.h>
@@ -60,8 +61,8 @@ int AmdPowerXpressRequestHighPerformance = 1;
 
 namespace Render
 {
-    // atlasTexture is optional as to not instantiate until opengl is setup.
-    boost::optional<AtlasTexture> atlasTexture = boost::none;
+    // atlasTexture is unique_ptr as to not instantiate until opengl is setup.
+    std::unique_ptr<AtlasTexture> atlasTexture = nullptr;
 
     /* Caches level sprites/positions etc in a format that can be directly injected into GL VBOs. */
     class DrawLevelCache
@@ -161,7 +162,7 @@ namespace Render
         int major = glVersion[0] - '0';
         int minor = glVersion[2] - '0';
         if (major < 3 || (major == 3 && minor < 3))
-            std::cerr << "ERROR: Minimum OpenGL version is 3.3. Your current version is " << major << "." << minor << std::endl;
+            message_and_abort_fmt("ERROR: Minimum OpenGL version is 3.3. Your current version is %d.%d\n", major, minor);
 
         /*int oglIdx = -1;
         int nRD = SDL_GetNumRenderDrivers();
@@ -184,7 +185,7 @@ namespace Render
         glDisable(GL_CULL_FACE);
         glDisable(GL_DEPTH_TEST);
 
-        atlasTexture = AtlasTexture();
+        atlasTexture = boost::make_unique<AtlasTexture>();
 
         if (nk_ctx)
         {
@@ -967,7 +968,7 @@ namespace Render
         jo_gif_end(&gif);
     }
 
-    bool SpriteGroup::canDelete()
+    bool SpriteGroup::canDeleteSprites()
     {
         // Sprites can not currently be removed from atlas texture.
         return false;

diff --git a/components/render/sdl_gl_funcs.h b/components/render/sdl_gl_funcs.h
@@ -8,7 +8,7 @@
         GLenum err;                                                                                                                                            \
         while ((err = glGetError()) != GL_NO_ERROR)                                                                                                            \
         {                                                                                                                                                      \
-            fprintf(stderr, "glError %s:%d, 0x%04X\n", __FILE__, __LINE__, err);                                                                               \
+            message_and_abort_fmt("glError %s:%d, 0x%04X\n", __FILE__, __LINE__, err);                                                                         \
         }                                                                                                                                                      \
     }