cleanup

Author: Shivansps

code/graphics/opengl/gropengltexture.cpp

@@ -24,7 +24,7 @@
 #include "math/vecmat.h"
 #include "options/Option.h"
 #include "osapi/osregistry.h"
-#include <ktxutils/ktxutils.h>
+#include "ktxutils/ktxutils.h"
 matrix4 GL_texture_matrix;
 
 int GL_texture_ram = 0;
@@ -450,7 +450,7 @@ static int opengl_texture_set_level(int bitmap_handle, int bitmap_type, int bmap
 	case KTX_ETC2_RGB_A1:
 	case KTX_ETC2_SRGB_A1:
 		intFormat = ktx_map_ktx_format_to_gl_internal(bm_handle);
-		block_size = ktx_etc_block_bytes(intFormat);
+		block_size = ktx_etc_block_size(intFormat);
 		break;
 	}
 

code/ktxutils/ktxutils.cpp

@@ -13,8 +13,7 @@
 
 static const uint8_t KTX_ID[12] = { 0xAB, 'K', 'T', 'X', ' ', '1', '1', 0xBB, '\r', '\n', 0x1A, '\n' };
 
-// BPB ETC/EAC
-uint32_t ktx_etc_block_bytes(const int internal_format)
+uint32_t ktx_etc_block_size(const int internal_format)
 {
 	switch (internal_format) 
 	{
@@ -33,7 +32,6 @@ uint32_t ktx_etc_block_bytes(const int internal_format)
 	}
 }
 
-
 int ktx_map_ktx_format_to_gl_internal(const int ktx_format)
 {
 	switch (ktx_format) 
@@ -55,7 +53,7 @@ int ktx_map_ktx_format_to_gl_internal(const int ktx_format)
 	}
 }
 
-int ktx_map_gl_internal_to_bm(const int internal_format)
+int ktx_map_gl_internal_to_bm_type(const int internal_format)
 {
 	switch (internal_format) 
 	{
@@ -140,8 +138,8 @@ int ktx1_read_header(const char* filename, CFILE* img_cfp, int* w, int* h, int*
 	}
 
 	const uint32_t fmt = hdr.glInternalFormat;
-	const uint32_t blockBytes = ktx_etc_block_bytes(fmt);
-	const int bm_ct = ktx_map_gl_internal_to_bm(fmt);
+	const uint32_t blockBytes = ktx_etc_block_size(fmt);
+	const int bm_ct = ktx_map_gl_internal_to_bm_type(fmt);
 	if (blockBytes == 0 || bm_ct == BM_TYPE_NONE) {
 		if (!img_cfp)
 			cfclose(cf);

code/ktxutils/ktxutils.h

@@ -2,7 +2,7 @@
 #include "globalincs/pstypes.h"
 #include "cfile/cfile.h"
 #ifdef WITH_OPENGL
-#include <glad/glad.h>
+#include "glad/glad.h"
 #endif
 
 // ETC2 types
@@ -69,5 +69,5 @@ int ktx1_read_bitmap(const char* filename, ubyte* dst, ubyte* out_bpp);
 //Get the GL enum type for this KTX format type, returns 0 if type is invalid.
 int ktx_map_ktx_format_to_gl_internal(const int ktx_format);
 
-//Get ktx bits per byte from GL internat format enum, returns 0 if internal format is invalid
-uint32_t ktx_etc_block_bytes(const int internal_format);
+//Get ktx block size (bytes per block) from GL internat format enum, returns 0 if internal format is invalid
+uint32_t ktx_etc_block_size(const int internal_format);