Fix some warnings/errors in examples and demos

rswinkle · rswinkle · commit 4af8053b31c7 · 2025-09-14T17:09:23.000-07:00
diff --git a/demos/main.cpp b/demos/main.cpp
@@ -453,7 +453,7 @@ int main(int argc, char** argv)
 		glDrawArrays(GL_LINES, 0, line_verts.size());
 
 
-		glBindTexture(GL_TEXTURE_2D, textures[tex_index]);
+		glBindTexture(GL_TEXTURE_2D, textures[2]);
 		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, the_Context.back_buffer.buf);
 
 		if (!depth_test)
@@ -463,7 +463,7 @@ int main(int argc, char** argv)
 
 
 		glUseProgram(my_programs[cur_shader]);
-		the_uniforms.tex = textures[tex_index];
+		the_uniforms.tex = textures[2];
 
 		the_uniforms.mvp = MVP;
 
@@ -669,20 +669,22 @@ bool handle_events()
 			} else if (keysym.sym == SDLK_1) {
 				tex_index = (tex_index + 1) % NUM_TEXTURES;
 				the_uniforms.tex = textures[tex_index];
+				printf("tex_index = %d\n", tex_index);
 			}
 
 			break; //sdl_keydown
 
 		case SDL_WINDOWEVENT:
 			switch (event.window.event) {
-			case SDL_WINDOWEVENT_RESIZED:
+			case SDL_WINDOWEVENT_SIZE_CHANGED:
 				printf("window size %d x %d\n", event.window.data1, event.window.data2);
 				width = event.window.data1;
 				height = event.window.data2;
 
 				remake_projection = true;
 
-				bbufpix = (u32*)pglResizeFramebuffer(width, height);
+				pglResizeFramebuffer(width, height);
+				bbufpix = (u32*)pglGetBackBuffer();
 				glViewport(0, 0, width, height);
 				SDL_DestroyTexture(tex);
 				tex = SDL_CreateTexture(ren, PIX_FORMAT, SDL_TEXTUREACCESS_STREAMING, width, height);
diff --git a/demos/sphereworld.cpp b/demos/sphereworld.cpp
@@ -817,14 +817,15 @@ bool handle_events()
 
 		case SDL_WINDOWEVENT:
 			switch (event.window.event) {
-			case SDL_WINDOWEVENT_RESIZED:
+			case SDL_WINDOWEVENT_SIZE_CHANGED:
 				printf("window size %d x %d\n", event.window.data1, event.window.data2);
 				width = event.window.data1;
 				height = event.window.data2;
 
 				remake_projection = true;
 
-				bbufpix = (u32*)pglResizeFramebuffer(width, height);
+				pglResizeFramebuffer(width, height);
+				bbufpix = (u32*)pglGetBackBuffer();
 				glViewport(0, 0, width, height);
 				SDL_DestroyTexture(tex);
 				tex = SDL_CreateTexture(ren, PIX_FORMAT, SDL_TEXTUREACCESS_STREAMING, width, height);
diff --git a/demos/sphereworld_color.cpp b/demos/sphereworld_color.cpp
@@ -493,7 +493,8 @@ int handle_events(GLFrame& camera_frame, unsigned int last_time, unsigned int cu
 
 				remake_projection = true;
 
-				bbufpix = (u32*)pglResizeFramebuffer(width, height);
+				pglResizeFramebuffer(width, height);
+				bbufpix = (u32*)pglGetBackBuffer();
 				glViewport(0, 0, width, height);
 				SDL_DestroyTexture(tex);
 				tex = SDL_CreateTexture(ren, PIX_FORMAT, SDL_TEXTUREACCESS_STREAMING, width, height);
diff --git a/demos/testprimitives.cpp b/demos/testprimitives.cpp
@@ -116,7 +116,7 @@ typedef struct shader_pair
 	vert_func vs;
 	frag_func fs;
 	int n_interp;
-	int interp[GL_MAX_VERTEX_OUTPUT_COMPONENTS];
+	GLenum interp[GL_MAX_VERTEX_OUTPUT_COMPONENTS];
 	int use_fragdepth_or_discard;
 } shader_pair;
 
diff --git a/examples/ex1.c b/examples/ex1.c
@@ -116,7 +116,7 @@ void uniform_color_fs(float* fs_input, Shader_Builtins* builtins, void* uniforms
 	builtins->gl_FragColor = ((My_Uniforms*)uniforms)->v_color;
 }
 
-void setup_context()
+void setup_context(void)
 {
 	if (SDL_Init(SDL_INIT_VIDEO)) {
 		printf("SDL_Init error: %s\n", SDL_GetError());
@@ -140,7 +140,7 @@ void setup_context()
 	}
 }
 
-void cleanup()
+void cleanup(void)
 {
 	free_glContext(&the_Context);
 
@@ -151,7 +151,7 @@ void cleanup()
 	SDL_Quit();
 }
 
-int handle_events()
+int handle_events(void)
 {
 	SDL_Event e;
 	int sc;
diff --git a/examples/ex2.c b/examples/ex2.c
@@ -105,7 +105,7 @@ void smooth_fs(float* fs_input, Shader_Builtins* builtins, void* uniforms)
 	builtins->gl_FragColor = ((vec4*)fs_input)[0];
 }
 
-void setup_context()
+void setup_context(void)
 {
 	if (SDL_Init(SDL_INIT_VIDEO)) {
 		printf("SDL_Init error: %s\n", SDL_GetError());
@@ -128,7 +128,7 @@ void setup_context()
 	}
 }
 
-void cleanup()
+void cleanup(void)
 {
 	free_glContext(&the_Context);
 
@@ -139,7 +139,7 @@ void cleanup()
 	SDL_Quit();
 }
 
-int handle_events()
+int handle_events(void)
 {
 	SDL_Event e;
 	int sc;
diff --git a/examples/ex3.c b/examples/ex3.c
@@ -131,7 +131,7 @@ void smooth_fs(float* fs_input, Shader_Builtins* builtins, void* uniforms)
 	builtins->gl_FragColor = ((vec4*)fs_input)[0];
 }
 
-void setup_context()
+void setup_context(void)
 {
 	if (SDL_Init(SDL_INIT_VIDEO)) {
 		printf("SDL_Init error: %s\n", SDL_GetError());
@@ -154,7 +154,7 @@ void setup_context()
 	}
 }
 
-void cleanup()
+void cleanup(void)
 {
 	free_glContext(&the_Context);
 
@@ -165,7 +165,7 @@ void cleanup()
 	SDL_Quit();
 }
 
-int handle_events()
+int handle_events(void)
 {
 	SDL_Event e;
 	int sc;
diff --git a/examples/lines.c b/examples/lines.c
@@ -41,9 +41,9 @@ int blending;
 int smooth;
 float granularity;
 
-void cleanup();
-void setup_context();
-int handle_events();
+void cleanup(void);
+void setup_context(void);
+int handle_events(void);
 
 typedef struct vert_data
 {
@@ -181,7 +181,7 @@ int main(int argc, char** argv)
 	return 0;
 }
 
-void setup_context()
+void setup_context(void)
 {
 	if (SDL_Init(SDL_INIT_VIDEO)) {
 		printf("SDL_Init error: %s\n", SDL_GetError());
@@ -206,7 +206,7 @@ void setup_context()
 	}
 }
 
-void cleanup()
+void cleanup(void)
 {
 
 	free_glContext(&the_Context);
@@ -218,7 +218,7 @@ void cleanup()
 	SDL_Quit();
 }
 
-int handle_events()
+int handle_events(void)
 {
 	SDL_Event e;
 	int sc;

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ void uniform_color_fs(float* fs_input, Shader_Builtins* builtins, void* uniforms`
`116`	`116`	`builtins->gl_FragColor = ((My_Uniforms*)uniforms)->v_color;`
`117`	`117`	`}`
`118`	`118`
`119`		`-void setup_context()`
	`119`	`+void setup_context(void)`
`120`	`120`	`{`
`121`	`121`	`if (SDL_Init(SDL_INIT_VIDEO)) {`
`122`	`122`	`printf("SDL_Init error: %s\n", SDL_GetError());`
`@@ -140,7 +140,7 @@ void setup_context()`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
`143`		`-void cleanup()`
	`143`	`+void cleanup(void)`
`144`	`144`	`{`
`145`	`145`	`free_glContext(&the_Context);`
`146`	`146`
`@@ -151,7 +151,7 @@ void cleanup()`
`151`	`151`	`SDL_Quit();`
`152`	`152`	`}`
`153`	`153`
`154`		`-int handle_events()`
	`154`	`+int handle_events(void)`
`155`	`155`	`{`
`156`	`156`	`SDL_Event e;`
`157`	`157`	`int sc;`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ void smooth_fs(float* fs_input, Shader_Builtins* builtins, void* uniforms)`
`105`	`105`	`builtins->gl_FragColor = ((vec4*)fs_input)[0];`
`106`	`106`	`}`
`107`	`107`
`108`		`-void setup_context()`
	`108`	`+void setup_context(void)`
`109`	`109`	`{`
`110`	`110`	`if (SDL_Init(SDL_INIT_VIDEO)) {`
`111`	`111`	`printf("SDL_Init error: %s\n", SDL_GetError());`
`@@ -128,7 +128,7 @@ void setup_context()`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
`131`		`-void cleanup()`
	`131`	`+void cleanup(void)`
`132`	`132`	`{`
`133`	`133`	`free_glContext(&the_Context);`
`134`	`134`
`@@ -139,7 +139,7 @@ void cleanup()`
`139`	`139`	`SDL_Quit();`
`140`	`140`	`}`
`141`	`141`
`142`		`-int handle_events()`
	`142`	`+int handle_events(void)`
`143`	`143`	`{`
`144`	`144`	`SDL_Event e;`
`145`	`145`	`int sc;`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ void smooth_fs(float* fs_input, Shader_Builtins* builtins, void* uniforms)`
`131`	`131`	`builtins->gl_FragColor = ((vec4*)fs_input)[0];`
`132`	`132`	`}`
`133`	`133`
`134`		`-void setup_context()`
	`134`	`+void setup_context(void)`
`135`	`135`	`{`
`136`	`136`	`if (SDL_Init(SDL_INIT_VIDEO)) {`
`137`	`137`	`printf("SDL_Init error: %s\n", SDL_GetError());`
`@@ -154,7 +154,7 @@ void setup_context()`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`157`		`-void cleanup()`
	`157`	`+void cleanup(void)`
`158`	`158`	`{`
`159`	`159`	`free_glContext(&the_Context);`
`160`	`160`
`@@ -165,7 +165,7 @@ void cleanup()`
`165`	`165`	`SDL_Quit();`
`166`	`166`	`}`
`167`	`167`
`168`		`-int handle_events()`
	`168`	`+int handle_events(void)`
`169`	`169`	`{`
`170`	`170`	`SDL_Event e;`
`171`	`171`	`int sc;`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@ int blending;`
`41`	`41`	`int smooth;`
`42`	`42`	`float granularity;`
`43`	`43`
`44`		`-void cleanup();`
`45`		`-void setup_context();`
`46`		`-int handle_events();`
	`44`	`+void cleanup(void);`
	`45`	`+void setup_context(void);`
	`46`	`+int handle_events(void);`
`47`	`47`
`48`	`48`	`typedef struct vert_data`
`49`	`49`	`{`
`@@ -181,7 +181,7 @@ int main(int argc, char** argv)`
`181`	`181`	`return 0;`
`182`	`182`	`}`
`183`	`183`
`184`		`-void setup_context()`
	`184`	`+void setup_context(void)`
`185`	`185`	`{`
`186`	`186`	`if (SDL_Init(SDL_INIT_VIDEO)) {`
`187`	`187`	`printf("SDL_Init error: %s\n", SDL_GetError());`
`@@ -206,7 +206,7 @@ void setup_context()`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`
`209`		`-void cleanup()`
	`209`	`+void cleanup(void)`
`210`	`210`	`{`
`211`	`211`
`212`	`212`	`free_glContext(&the_Context);`
`@@ -218,7 +218,7 @@ void cleanup()`
`218`	`218`	`SDL_Quit();`
`219`	`219`	`}`
`220`	`220`
`221`		`-int handle_events()`
	`221`	`+int handle_events(void)`
`222`	`222`	`{`
`223`	`223`	`SDL_Event e;`
`224`	`224`	`int sc;`