Whee

Author: jdolan

Examples/Hello.c

@@ -28,6 +28,10 @@
 #include <Objectively.h>
 #include <ObjectivelyGPU.h>
 
+#ifndef SHADERS
+# define SHADERS "."
+#endif
+
 typedef struct {
 	float x, y, z;
 	float r, g, b;
@@ -103,8 +107,6 @@ static void upload_vertex_buffer(const RenderDevice *renderDevice, SDL_GPUBuffer
 
 
 int main(int argc, char **argv) {
-	(void) argc;
-	(void) argv;
 
 	int status = EXIT_FAILURE;
 	SDL_Window *window = NULL;
@@ -121,12 +123,7 @@ int main(int argc, char **argv) {
 		return status;
 	}
 
-	const char *basePath = SDL_GetBasePath();
-	if (basePath) {
-		char shaderDir[512];
-		SDL_snprintf(shaderDir, sizeof(shaderDir), "%sShaders", basePath);
-		$$(Resource, addResourcePath, shaderDir);
-	}
+  $$(Resource, addResourcePath, SHADERS);
 
 	window = SDL_CreateWindow("ObjectivelyGPU Hello", 800, 600, SDL_WINDOW_HIGH_PIXEL_DENSITY);
 	if (!window) {

Examples/Makefile.am

@@ -6,6 +6,7 @@ noinst_PROGRAMS = \
 
 CFLAGS += \
 	-I$(top_srcdir)/Sources \
+ 	-DSHADERS=\"$(abs_srcdir)/Shaders\" \ 
 	@HOST_CFLAGS@ \
 	@OBJECTIVELY_CFLAGS@ \
 	@SDL3_CFLAGS@

ObjectivelyGPU.xcodeproj/project.pbxproj

@@ -135,6 +135,7 @@
 		CECF83A02FEF6B2400CB0CCA /* HelloCompute.frag.spv */ = {isa = PBXFileReference; lastKnownFileType = file; path = HelloCompute.frag.spv; sourceTree = "<group>"; };
 		CECF83A12FEF6B2400CB0CCA /* HelloCompute.vert.msl */ = {isa = PBXFileReference; lastKnownFileType = text; path = HelloCompute.vert.msl; sourceTree = "<group>"; };
 		CECF83A22FEF6B2400CB0CCA /* HelloCompute.vert.spv */ = {isa = PBXFileReference; lastKnownFileType = file; path = HelloCompute.vert.spv; sourceTree = "<group>"; };
+		CECF83A32FEF6F5B00CB0CCA /* Makefile.am */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
 		CEEAAFF72FED833A00FFEBE6 /* COPYING */ = {isa = PBXFileReference; lastKnownFileType = text; path = COPYING; sourceTree = "<group>"; };
 		CEEAAFF82FED833A00FFEBE6 /* Makefile.am */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
 		CEEAAFFA2FED833A00FFEBE6 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -288,6 +289,7 @@
 				SC00500000000000000000A0 /* Shaders */,
 				EE00010000000000000000B1 /* Hello.c */,
 				EE00020000000000000000B2 /* HelloCompute.c */,
+				CECF83A32FEF6F5B00CB0CCA /* Makefile.am */,
 			);
 			path = Examples;
 			sourceTree = "<group>";

Sources/ObjectivelyGPU/RenderDevice.c

@@ -288,7 +288,7 @@ static SDL_GPUShader *loadShader(const RenderDevice *self, const char *name, con
     return shader;
   }
 
-  GPU_Assert(false, "loadShader: no supported format found for '%s'", name);
+  GPU_Assert(false, "loadShader: no supported format found for '%s'\n", name);
   return NULL;
 }
 

Sources/ObjectivelyGPU/Types.h

@@ -65,10 +65,9 @@ struct SDL_Size {
  * SDL_gpu operations where failure is unrecoverable (bad device, OOM, wrong
  * thread, unsupported format, etc.).
  */
-#define GPU_Assert(cond, fmt, ...) do { \
+#define GPU_Assert(cond, fmt, ...) \
   if (!(cond)) { \
-    SDL_LogCritical(SDL_LOG_CATEGORY_GPU, "%s::%s: " fmt ": %s", _Class()->def.name, __func__, ## __VA_ARGS__, SDL_GetError()); \
+    SDL_LogCritical(SDL_LOG_CATEGORY_GPU, "%s::%d::%s: " fmt ": %s", __FILE__, __LINE__, __func__, ## __VA_ARGS__, SDL_GetError()); \
     SDL_TriggerBreakpoint(); \
     exit(EXIT_FAILURE); \
-  } \
-} while (0)
+  }