From e968db3458b69523801dc016a559dcd0c6aa0803 Mon Sep 17 00:00:00 2001
From: Shiqing <shiqing-thu18@yandex.com>
Date: Sun, 17 Mar 2019 14:42:39 +0800
Subject: [PATCH] Simplify Sokol rendering process

---
 src/system/.sokol_gfx.c.swp | Bin 0 -> 20480 bytes
 src/system/sokol_gfx.c      |  48 ++++++------------------------------
 2 files changed, 7 insertions(+), 41 deletions(-)
 create mode 100644 src/system/.sokol_gfx.c.swp

diff --git a/src/system/.sokol_gfx.c.swp b/src/system/.sokol_gfx.c.swp
new file mode 100644
index 0000000000000000000000000000000000000000..b8834a97a73e79159e85c5fd2946ec6c76701bc6
GIT binary patch
literal 20480
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

literal 0
HcmV?d00001

diff --git a/src/system/sokol_gfx.c b/src/system/sokol_gfx.c
index 094139c..e1b4caa 100644
--- a/src/system/sokol_gfx.c
+++ b/src/system/sokol_gfx.c
@@ -2,8 +2,6 @@
 
 static struct 
 {
-    sg_draw_state upscale_draw_state;
-    sg_pass upscale_pass;
     sg_draw_state draw_state;
     int fb_width;
     int fb_height;
@@ -130,13 +128,9 @@ void sokol_gfx_init(int w, int h, int sx, int sy, bool integer_scale, bool portr
         0.0f, 1.0f, 0.0f, 0.0f,
         1.0f, 1.0f,  1.0f, 0.0f
     };
-    sokol_gfx.upscale_draw_state.vertex_buffers[0] = sg_make_buffer(&(sg_buffer_desc){
-        .size = sizeof(verts),
-        .content = verts,
-    });
     sokol_gfx.draw_state.vertex_buffers[0] = sg_make_buffer(&(sg_buffer_desc){
         .size = sizeof(verts),
-        .content = sg_query_feature(SG_FEATURE_ORIGIN_TOP_LEFT) ? verts : verts_flipped
+        .content = sg_query_feature(SG_FEATURE_ORIGIN_TOP_LEFT) ? verts_flipped : verts,
     });
 
     /* a shader to render a textured quad */
@@ -148,7 +142,7 @@ void sokol_gfx_init(int w, int h, int sx, int sy, bool integer_scale, bool portr
         .fs.source = gfx_fs_src,
     });
 
-    /* 2 pipeline-state-objects, one for upscaling, one for rendering */
+    /* a pipeline-state-object for rendering */
     sg_pipeline_desc pip_desc = {
         .layout = {
             .attrs[0] = { .name="in_pos", .sem_name="POS", .format=SG_VERTEXFORMAT_FLOAT2 },
@@ -158,11 +152,9 @@ void sokol_gfx_init(int w, int h, int sx, int sy, bool integer_scale, bool portr
         .primitive_type = SG_PRIMITIVETYPE_TRIANGLE_STRIP
     };
     sokol_gfx.draw_state.pipeline = sg_make_pipeline(&pip_desc);
-    pip_desc.blend.depth_format = SG_PIXELFORMAT_NONE;
-    sokol_gfx.upscale_draw_state.pipeline = sg_make_pipeline(&pip_desc);
 
-    /* a texture with the emulator's raw pixel data */
-    sokol_gfx.upscale_draw_state.fs_images[0] = sg_make_image(&(sg_image_desc){
+    /* a texture with the pixel data */
+    sokol_gfx.draw_state.fs_images[0] = sg_make_image(&(sg_image_desc){
         .width = sokol_gfx.fb_width,
         .height = sokol_gfx.fb_height,
         .pixel_format = SG_PIXELFORMAT_RGBA8,
@@ -172,28 +164,8 @@ void sokol_gfx_init(int w, int h, int sx, int sy, bool integer_scale, bool portr
         .wrap_u = SG_WRAP_CLAMP_TO_EDGE,
         .wrap_v = SG_WRAP_CLAMP_TO_EDGE
     });
-    /* a 2x upscaled render-target-texture */
-    sokol_gfx.draw_state.fs_images[0] = sg_make_image(&(sg_image_desc){
-        .render_target = true,
-        .width = 2*sokol_gfx.fb_width,
-        .height = 2*sokol_gfx.fb_height,
-        .pixel_format = SG_PIXELFORMAT_RGBA8,
-        .min_filter = SG_FILTER_NEAREST,
-        .mag_filter = SG_FILTER_NEAREST,
-        .wrap_u = SG_WRAP_CLAMP_TO_EDGE,
-        .wrap_v = SG_WRAP_CLAMP_TO_EDGE
-    });
-
-    /* a render pass for the 2x upscaling */
-    sokol_gfx.upscale_pass = sg_make_pass(&(sg_pass_desc){
-        .color_attachments[0].image = sokol_gfx.draw_state.fs_images[0]
-    });
 }
 
-static const sg_pass_action gfx_upscale_pass_action = {
-    .colors[0] = { .action = SG_ACTION_DONTCARE }
-};
-
 static const sg_pass_action gfx_draw_pass_action = {
     .colors[0] = { .action = SG_ACTION_CLEAR, .val = { 0.05f, 0.05f, 0.05f, 1.0f } }
 };
@@ -244,21 +216,15 @@ static void apply_viewport(void) {
 
 void sokol_gfx_draw(const uint32_t* ptr) {
 
-    /* copy emulator pixel data into upscaling source texture */
-    sg_update_image(sokol_gfx.upscale_draw_state.fs_images[0], &(sg_image_content){
+    /* copy pixel data into the source texture */
+    sg_update_image(sokol_gfx.draw_state.fs_images[0], &(sg_image_content){
         .subimage[0][0] = { 
             .ptr = ptr,
             .size = sokol_gfx.fb_width*sokol_gfx.fb_height*sizeof ptr[0]
         }
     });
 
-    /* upscale the original framebuffer 2x with nearest filtering */
-    sg_begin_pass(sokol_gfx.upscale_pass, &gfx_upscale_pass_action);
-    sg_apply_draw_state(&sokol_gfx.upscale_draw_state);
-    sg_draw(0, 4, 1);
-    sg_end_pass();
-
-    /* draw the final pass with linear filtering */
+    /* draw to the screen */
     sg_begin_default_pass(&gfx_draw_pass_action, sapp_width(), sapp_height());
     apply_viewport();
     sg_apply_draw_state(&sokol_gfx.draw_state);