[Fix] gpu size calculation for PIXELFORMAT_L8_A8 and mipmaps (playcanvas#2350)

mvaligursky · web-flow · commit 0b529cba24d8 · 2020-08-11T16:23:07.000+01:00
* [Fix] gpu size calculation for PIXELFORMAT_L8_A8 and mipmaps

* lint fix
diff --git a/src/graphics/texture.js b/src/graphics/texture.js
@@ -2,7 +2,7 @@ import { math } from '../math/math.js';
 
 import {
     ADDRESS_REPEAT,
-    FILTER_LINEAR, FILTER_NEAREST_MIPMAP_NEAREST, FILTER_NEAREST_MIPMAP_LINEAR, FILTER_LINEAR_MIPMAP_NEAREST, FILTER_LINEAR_MIPMAP_LINEAR,
+    FILTER_LINEAR, FILTER_LINEAR_MIPMAP_LINEAR,
     FUNC_LESS,
     PIXELFORMAT_A8, PIXELFORMAT_L8, PIXELFORMAT_L8_A8, PIXELFORMAT_R5_G6_B5, PIXELFORMAT_R5_G5_B5_A1, PIXELFORMAT_R4_G4_B4_A4,
     PIXELFORMAT_R8_G8_B8, PIXELFORMAT_R8_G8_B8_A8, PIXELFORMAT_DXT1, PIXELFORMAT_DXT3, PIXELFORMAT_DXT5,
@@ -500,14 +500,7 @@ Object.defineProperties(Texture.prototype, {
 
     gpuSize: {
         get: function () {
-            var mips = this.pot &&
-                    (this._mipmaps ||
-                        this._minFilter === FILTER_NEAREST_MIPMAP_NEAREST ||
-                        this._minFilter === FILTER_NEAREST_MIPMAP_LINEAR ||
-                        this._minFilter === FILTER_LINEAR_MIPMAP_NEAREST ||
-                        this._minFilter === FILTER_LINEAR_MIPMAP_LINEAR) &&
-                        !(this._compressed && this._levels.length === 1);
-
+            var mips = this.pot && this._mipmaps && !(this._compressed && this._levels.length === 1);
             return Texture.calcGpuSize(this._width, this._height, this._depth, this._format, mips, this._cubemap);
         }
     },
@@ -591,7 +584,7 @@ Object.assign(Texture, {
             _pixelSizeTable = [];
             _pixelSizeTable[PIXELFORMAT_A8] = 1;
             _pixelSizeTable[PIXELFORMAT_L8] = 1;
-            _pixelSizeTable[PIXELFORMAT_L8_A8] = 1;
+            _pixelSizeTable[PIXELFORMAT_L8_A8] = 2;
             _pixelSizeTable[PIXELFORMAT_R5_G6_B5] = 2;
             _pixelSizeTable[PIXELFORMAT_R5_G5_B5_A1] = 2;
             _pixelSizeTable[PIXELFORMAT_R4_G4_B4_A4] = 2;
