optimized, but bug with rasterdemos

1 files changed, 1 insertions, 81 deletions

diff --git a/mknes.h b/mknes.h
index c41d7af..d21a9ad 100644
--- a/mknes.h
+++ b/mknes.h
@@ -60,7 +60,7 @@ struct ppu_state {
 		uint8_t position;
 		uint8_t priority;
 		uint8_t palette;
-	} __attribute__((packed, aligned(64))) sprites[8];
+	} __attribute__((packed)) sprites[8] __attribute__((aligned(64)));
 
 	uint8_t input[2];						// 40 - Controller 1 & 2
 	uint8_t input_latch[2];				// 42 - Latched inputs after strobe
@@ -151,83 +151,3 @@ __attribute__((aligned(4096))) static uint32_t nes_palette[65] = {
 	0xdee086ff, 0xc6ec87ff, 0xb2f29dff, 0xa7f0c3ff, 0xa8e7f0ff, 0xacacacff, 0x000000ff, 0x000000ff,
 	0xffffffff	// one extra for debug-coloring...
 };
-
-struct remake_state {
-	struct { int32_t x, y, w, h; } viewport;
-	int32_t mouse_dx;
-	int32_t mouse_dy;
-
-	float contrast;
-	float saturation;
-	float brightness;
-	float tone_data[4];
-
-	// OpenGL Objects
-	GLuint shader_program;
-	GLuint persistence_program;
-	// GLuint upscale_program;
-	GLuint upscale_warp_program;
-	GLuint bloom_extract_program;
-	GLuint bloom_blur_program;
-	GLuint bloom_warp_program;
-	GLuint bloom_composite_program;
-
-	GLuint texture;
-	GLuint persistence_texture;
-	GLuint persistence_output_texture;
-	GLuint crt_output_texture;
-	GLuint bloom_texture;
-	GLuint bloom_temp_texture;
-	GLuint bloom_warped_texture;
-	GLuint upscaled_source_texture;
-
-	GLuint persistence_fbo;
-	GLuint upscaled_source_fbo;
-	GLuint crt_fbo;
-	GLuint bloom_fbo;
-	GLuint bloom_temp_fbo;
-	GLuint bloom_warp_fbo;
-
-	GLuint vao;
-	GLuint vbo;
-	GLuint ebo;
-
-	// CRT Shader Uniforms
-	GLuint uniform_resolution;
-	GLuint uniform_src_image_size;
-	GLuint uniform_brightness;
-	GLuint uniform_tone;
-	GLuint uniform_crt_emulation;
-	GLuint uniform_apply_mask;
-	GLuint uniform_sampler_location;
-
-	// Bloom Shader Uniforms
-	GLuint bloom_uniform_threshold;
-	GLuint bloom_uniform_sampler;
-	GLuint blur_uniform_horizontal;
-	GLuint blur_uniform_sampler;
-	GLuint composite_uniform_bloom_strength;
-	GLuint composite_uniform_crt_sampler;
-	GLuint composite_uniform_bloom_sampler;
-
-	// Bloom settings
-	float bloom_threshold;
-	float bloom_strength;
-	uint32_t bloom_width;
-	uint32_t bloom_height;
-
-	// Phosphor persistence
-	float persistence_decay;
-
-	// Rendering & Dynamic Resolution
-	uint32_t render_width;	// The actual remake resolution (e.g., 360)
-	uint32_t render_height;	// The actual remake resolution (e.g., 270)
-	uint32_t frame_number;
-	uint8_t running;
-	uint8_t toggle_crt_emulation;
-	uint8_t toggle_bloom;
-	uint8_t fullscreen;
-	uint8_t viewport_changed;  // Flag to signal render thread to recreate FBOs
-};
-
-// static struct remake_state state;