Thread-safe texture load queue

Also includes some VS2019 compile error/warning fixes, mostly related to missing "const" for string parameters.

Author: dclamage

engine/common.h

@@ -15,6 +15,7 @@
 #include <math.h>
 #include <io.h>
 #include <errno.h>
+#include <stdbool.h>
 
 #ifdef _DEBUG
 #include "common/memtrak3.h"

engine/core/core_image.cpp

@@ -11,9 +11,6 @@
 #include "_lib/jpeglib.h"
 #include "_lib/tiffio.h"
 #include "_lib/png.h"
-#ifndef __bool_true_false_are_defined
-#define __bool_true_false_are_defined
-#endif
 #include "_lib/gif_lib.h"
 
 // =======
@@ -61,22 +58,22 @@ void image_c::Free()
 	dat = NULL;
 }
 
-bool image_c::Load(char* fileName) 
+bool image_c::Load(const char* fileName) 
 {
 	return true; // o_O
 }
 
-bool image_c::Save(char* fileName) 
+bool image_c::Save(const char* fileName) 
 {
 	return true; // o_O
 }
 
-bool image_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool image_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	return true; // o_O
 }
 
-image_c* image_c::LoaderForFile(IConsole* conHnd, char* fileName)
+image_c* image_c::LoaderForFile(IConsole* conHnd, const char* fileName)
 {
 	fileInputStream_c in;
 	if (in.FileOpen(fileName, true)) {
@@ -131,7 +128,7 @@ struct tgaHeader_s {
 };
 #pragma pack(pop)
 
-bool targa_c::Load(char* fileName)
+bool targa_c::Load(const char* fileName)
 {
 	Free();
 
@@ -214,7 +211,7 @@ bool targa_c::Load(char* fileName)
 	return false;
 }
 
-bool targa_c::Save(char* fileName)
+bool targa_c::Save(const char* fileName)
 {
 	// Find a suitable image type
 	int ittable[3][3] = {
@@ -324,7 +321,7 @@ bool targa_c::Save(char* fileName)
 	return false;
 }
 
-bool targa_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool targa_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	// Open the file
 	fileInputStream_c in;
@@ -432,7 +429,7 @@ struct jpegRead_s: public jpeg_source_mgr {
 	}
 };
 
-bool jpeg_c::Load(char* fileName)
+bool jpeg_c::Load(const char* fileName)
 {
 	Free();
 
@@ -525,7 +522,7 @@ struct jpegWrite_s: public jpeg_destination_mgr {
 	}
 };
 
-bool jpeg_c::Save(char* fileName)
+bool jpeg_c::Save(const char* fileName)
 {
 	// JPEG only supports RGB and grayscale images
 	if (type != IMGTYPE_RGB && type != IMGTYPE_GRAY) {
@@ -588,7 +585,7 @@ bool jpeg_c::Save(char* fileName)
 
 // JPEG Image Info
 
-bool jpeg_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool jpeg_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	// Open the file
 	fileInputStream_c in;
@@ -677,7 +674,7 @@ static toff_t ITIFF_SizeProc(thandle_t clientData)
 	return cd->io->GetLen();
 }
 
-bool tiff_c::Load(char* fileName)
+bool tiff_c::Load(const char* fileName)
 {
 	Free();
 
@@ -712,7 +709,7 @@ bool tiff_c::Load(char* fileName)
 	return ret;
 }
 
-bool tiff_c::Save(char* fileName)
+bool tiff_c::Save(const char* fileName)
 {
 	// Only save RGB or RGBA
 	if (type != IMGTYPE_RGB && type != IMGTYPE_RGBA) {
@@ -753,7 +750,7 @@ bool tiff_c::Save(char* fileName)
 	return false;
 }
 
-bool tiff_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool tiff_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	// Open the file
 	fileInputStream_c in;
@@ -804,7 +801,7 @@ static void IPNG_ReadProc(png_structp png, png_bytep data, png_size_t len)
 	}
 }
 
-bool png_c::Load(char* fileName)
+bool png_c::Load(const char* fileName)
 {
 	Free();
 
@@ -875,7 +872,7 @@ static void IPNG_FlushProc(png_structp png)
 	out->FileFlush();
 }
 
-bool png_c::Save(char* fileName)
+bool png_c::Save(const char* fileName)
 {
 	if (type != IMGTYPE_RGB && type != IMGTYPE_RGBA) {
 		return true;
@@ -915,7 +912,7 @@ bool png_c::Save(char* fileName)
 
 // PNG Image Info
 
-bool png_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool png_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	// Open file and check signature
 	fileInputStream_c in;
@@ -973,7 +970,7 @@ static int IGIF_ReadProc(GifFileType* gif, GifByteType* buf, int len)
 	return len;
 }
 
-bool gif_c::Load(char* fileName)
+bool gif_c::Load(const char* fileName)
 {
 	// Open file
 	fileInputStream_c in;
@@ -1025,13 +1022,13 @@ bool gif_c::Load(char* fileName)
 	return false;
 }
 
-bool gif_c::Save(char* fileName)
+bool gif_c::Save(const char* fileName)
 {
 	// HELL no.
 	return true;
 }
 
-bool gif_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool gif_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	return true;
 }
@@ -1063,7 +1060,7 @@ struct blpMipmapHeader_s {
 };
 #pragma pack(pop)
 
-bool blp_c::Load(char* fileName)
+bool blp_c::Load(const char* fileName)
 {
 	Free();
 
@@ -1134,13 +1131,13 @@ bool blp_c::Load(char* fileName)
 	return false;
 }
 
-bool blp_c::Save(char* fileName)
+bool blp_c::Save(const char* fileName)
 {
 	// No.
 	return true;
 }
 
-bool blp_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool blp_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	// Open the file
 	fileInputStream_c in;

engine/core/core_image.h

@@ -44,68 +44,68 @@ class image_c {
 
 	IConsole* con;
 
-	virtual bool Load(char* fileName);
-	virtual bool Save(char* fileName);
-	virtual bool ImageInfo(char* fileName, imageInfo_s* info);
+	virtual bool Load(const char* fileName);
+	virtual bool Save(const char* fileName);
+	virtual bool ImageInfo(const char* fileName, imageInfo_s* info);
 
 	void CopyRaw(int type, dword width, dword height, const byte* dat);
 	void Free();
 
-	static image_c* LoaderForFile(IConsole* conHnd, char* fileName);
+	static image_c* LoaderForFile(IConsole* conHnd, const char* fileName);
 };
 
 // Targa Image
 class targa_c: public image_c {
 public:
 	bool	rle;
 	targa_c(IConsole* conHnd): image_c(conHnd) { rle = true; }
-	bool	Load(char* fileName);
-	bool	Save(char* fileName);
-	bool	ImageInfo(char* fileName, imageInfo_s* info);
+	bool	Load(const char* fileName) override;
+	bool	Save(const char* fileName) override;
+	bool	ImageInfo(const char* fileName, imageInfo_s* info) override;
 };
 
 // JPEG Image
 class jpeg_c: public image_c {
 public:
 	int		quality;
 	jpeg_c(IConsole* conHnd): image_c(conHnd) { quality = 80; }
-	bool	Load(char* fileName);
-	bool	Save(char* fileName);
-	bool	ImageInfo(char* fileName, imageInfo_s* info);
+	bool	Load(const char* fileName) override;
+	bool	Save(const char* fileName) override;
+	bool	ImageInfo(const char* fileName, imageInfo_s* info) override;
 };
 
 // TIFF Image
 class tiff_c: public image_c {
 public:
 	tiff_c(IConsole* conHnd): image_c(conHnd) { }
-	bool	Load(char* fileName);
-	bool	Save(char* fileName);
-	bool	ImageInfo(char* fileName, imageInfo_s* info);
+	bool	Load(const char* fileName) override;
+	bool	Save(const char* fileName) override;
+	bool	ImageInfo(const char* fileName, imageInfo_s* info) override;
 };
 
 // PNG Image
 class png_c: public image_c {
 public:
 	png_c(IConsole* conHnd): image_c(conHnd) { }
-	bool	Load(char* fileName);
-	bool	Save(char* fileName);
-	bool	ImageInfo(char* fileName, imageInfo_s* info);
+	bool	Load(const char* fileName) override;
+	bool	Save(const char* fileName) override;
+	bool	ImageInfo(const char* fileName, imageInfo_s* info) override;
 };
 
 // GIF Image
 class gif_c: public image_c {
 public:
 	gif_c(IConsole* conHnd): image_c(conHnd) { }
-	bool	Load(char* fileName);
-	bool	Save(char* fileName);
-	bool	ImageInfo(char* fileName, imageInfo_s* info);
+	bool	Load(const char* fileName) override;
+	bool	Save(const char* fileName) override;
+	bool	ImageInfo(const char* fileName, imageInfo_s* info) override;
 };
 
 // BLP Image
 class blp_c: public image_c {
 public:
 	blp_c(IConsole* conHnd): image_c(conHnd) { }
-	bool	Load(char* fileName);
-	bool	Save(char* fileName);
-	bool	ImageInfo(char* fileName, imageInfo_s* info);
+	bool	Load(const char* fileName) override;
+	bool	Save(const char* fileName) override;
+	bool	ImageInfo(const char* fileName, imageInfo_s* info) override;
 };

engine/render.h

@@ -59,7 +59,7 @@ class r_IRenderer {
 	virtual void	BeginFrame() = 0;
 	virtual void	EndFrame() = 0;
 
-	virtual r_shaderHnd_c* RegisterShader(char* name, int flags) = 0;
+	virtual r_shaderHnd_c* RegisterShader(const char* name, int flags) = 0;
 	virtual r_shaderHnd_c* RegisterShaderFromData(int width, int height, int type, byte* dat, int flags) = 0;
 	virtual void	GetShaderImageSize(r_shaderHnd_c* hnd, int &width, int &height) = 0;
 	virtual void	SetShaderLoadingPriority(r_shaderHnd_c* hnd, int pri) = 0;

engine/render/r_font.cpp

@@ -33,7 +33,7 @@ struct f_fontHeight_s {
 // Font Loader
 // ===========
 
-r_font_c::r_font_c(r_renderer_c* renderer, char* fontName)
+r_font_c::r_font_c(r_renderer_c* renderer, const char* fontName)
 	: renderer(renderer)
 {
 	numFontHeight = 0;

engine/render/r_font.h

@@ -11,7 +11,7 @@
 // Font
 class r_font_c {
 public:
-	r_font_c(class r_renderer_c* renderer, char* fontName);
+	r_font_c(class r_renderer_c* renderer, const char* fontName);
 	~r_font_c();
 
 	int		StringWidth(int height, const char* str);

engine/render/r_main.cpp

@@ -30,12 +30,12 @@ class r_shader_c {
 	int			refCount;
 	r_tex_c*	tex;
 
-	r_shader_c(r_renderer_c* renderer, char* shname, int flags);
-	r_shader_c(r_renderer_c* renderer, char* shname, int flags, int width, int height, int type, byte* dat);
+	r_shader_c(r_renderer_c* renderer, const char* shname, int flags);
+	r_shader_c(r_renderer_c* renderer, const char* shname, int flags, int width, int height, int type, byte* dat);
 	~r_shader_c();
 };
 
-r_shader_c::r_shader_c(r_renderer_c* renderer, char* shname, int flags)
+r_shader_c::r_shader_c(r_renderer_c* renderer, const char* shname, int flags)
 	: renderer(renderer)
 {
 	name = AllocString(shname);
@@ -47,7 +47,7 @@ r_shader_c::r_shader_c(r_renderer_c* renderer, char* shname, int flags)
 	}
 }
 
-r_shader_c::r_shader_c(r_renderer_c* renderer, char* shname, int flags, int width, int height, int type, byte* dat)
+r_shader_c::r_shader_c(r_renderer_c* renderer, const char* shname, int flags, int width, int height, int type, byte* dat)
 	: renderer(renderer)
 {
 	name = AllocString(shname);
@@ -475,14 +475,14 @@ void r_renderer_c::PurgeShaders()
 {
 	// Delete released shaders
 	for (int s = 0; s < numShader; s++) {
-		if (shaderList[s] && shaderList[s]->refCount == 0 && shaderList[s]->tex->loading == -1) {
+		if (shaderList[s] && shaderList[s]->refCount == 0 && shaderList[s]->tex->status == r_tex_c::DONE) {
 			delete shaderList[s];
 			shaderList[s] = NULL;
 		}
 	}
 }
 
-r_shaderHnd_c* r_renderer_c::RegisterShader(char* shname, int flags)
+r_shaderHnd_c* r_renderer_c::RegisterShader(const char* shname, int flags)
 {
 	if (*shname == 0) {
 		return NULL;
@@ -540,7 +540,7 @@ r_shaderHnd_c* r_renderer_c::RegisterShaderFromData(int width, int height, int t
 
 void r_renderer_c::GetShaderImageSize(r_shaderHnd_c* hnd, int &width, int &height)
 {
-	if (hnd && hnd->sh->tex->loading == -1) {
+	if (hnd && hnd->sh->tex->status == r_tex_c::DONE) {
 		width = hnd->sh->tex->fileWidth;
 		height = hnd->sh->tex->fileHeight;
 	} else {
@@ -551,7 +551,7 @@ void r_renderer_c::GetShaderImageSize(r_shaderHnd_c* hnd, int &width, int &heigh
 
 void r_renderer_c::SetShaderLoadingPriority(r_shaderHnd_c* hnd, int pri)
 {
-	if (hnd && hnd->sh->tex->loading >= 0) {
+	if (hnd && hnd->sh->tex->status != r_tex_c::DONE) {
 		hnd->sh->tex->loadPri = pri;
 	}
 }
@@ -723,7 +723,7 @@ void r_renderer_c::C_Screenshot(IConsole* conHnd, args_c &args)
 	}
 }
 
-void r_renderer_c::DoScreenshot(image_c* i, char* ext)
+void r_renderer_c::DoScreenshot(image_c* i, const char* ext)
 {
 	int xs = sys->video->vid.size[0];
 	int ys = sys->video->vid.size[1];