Doom: Software scaling to 640x480

Author: facchinm

libraries/ENVIE_Video_coreboot/anx7625.cpp

@@ -908,8 +908,8 @@ static void stm32_LayerInit(uint16_t LayerIndex, uint32_t FB_Address)
 	Layercfg.Backcolor.Red = 0;
 	Layercfg.BlendingFactor1 = LTDC_BLENDING_FACTOR1_PAxCA;
 	Layercfg.BlendingFactor2 = LTDC_BLENDING_FACTOR2_PAxCA;
-	Layercfg.ImageWidth = 320;
-	Layercfg.ImageHeight = 200;
+	Layercfg.ImageWidth = lcd_x_size;
+	Layercfg.ImageHeight = lcd_y_size;
 
 	HAL_LTDC_ConfigLayer(&ltdc, &Layercfg, LayerIndex);
 }
@@ -1168,7 +1168,7 @@ int stm32_dsi_config(uint8_t bus, struct edid *edid, struct display_timing *dt)
 
 	//HAL_LTDC_ProgramLineEvent(&ltdc, 0);
 
-	//HAL_DSI_PatternGeneratorStart(&dsi, 0, 1);
+	HAL_DSI_PatternGeneratorStart(&dsi, 0, 1);
 	HAL_DSI_PatternGeneratorStop(&dsi);
 	stm32_LCD_Clear(0);
 	stm32_LCD_Clear(0);

libraries/ENVIE_Video_coreboot/edid.c

@@ -1086,7 +1086,7 @@ static void dump_breakdown(unsigned char *edid)
  */
 struct edid_mode known_modes[NUM_KNOWN_MODES] = {
 	[EDID_MODE_320x240_60Hz] = {
-		.name = "320x240@60Hz", .pixel_clock = 25750, .refresh = 60,
+		.name = "320x240@60Hz", .pixel_clock = 25200, .refresh = 60,
 		.ha = 320, .hbl = 80, .hso = 48, .hspw = 32,
 		.va = 200, .vbl = 16, .vso = 6, .vspw = 3,
 		.phsync = '-', .pvsync = '-' },

libraries/doom/doomgeneric.h

@@ -3,8 +3,8 @@
 
 #include <stdint.h>
 
-#define DOOMGENERIC_RESX 320
-#define DOOMGENERIC_RESY 200
+#define DOOMGENERIC_RESX 640
+#define DOOMGENERIC_RESY 400
 
 
 extern uint32_t* DG_ScreenBuffer;

libraries/doom/i_video.c

@@ -256,50 +256,21 @@ void I_UpdateNoBlit (void)
 void I_FinishUpdate (void)
 {
 
-
-#if 0
-    int y;
-    int x_offset, y_offset, x_offset_end;
-    unsigned char *line_in, *line_out;
-
-    /* Offsets in case FB is bigger than DOOM */
-    /* 600 = s_Fb heigt, 200 screenheight */
-    /* 600 = s_Fb heigt, 200 screenheight */
-    /* 2048 =s_Fb width, 320 screenwidth */
-    y_offset     = (((s_Fb.yres - (SCREENHEIGHT * fb_scaling)) * s_Fb.bits_per_pixel/8)) / 2;
-    x_offset     = (((s_Fb.xres - (SCREENWIDTH  * fb_scaling)) * s_Fb.bits_per_pixel/8)) / 2; // XXX: siglent FB hack: /4 instead of /2, since it seems to handle the resolution in a funny way
-    //x_offset     = 0;
-    x_offset_end = ((s_Fb.xres - (SCREENWIDTH  * fb_scaling)) * s_Fb.bits_per_pixel/8) - x_offset;
-
-    /* DRAW SCREEN */
-    line_in  = (unsigned char *) I_VideoBuffer;
-    line_out = (unsigned char *) I_VideoBuffer_FB;
-
-    y = SCREENHEIGHT;
-
-    while (y--)
-    {
-        int i;
-        for (i = 0; i < fb_scaling; i++) {
-            line_out += x_offset;
-#ifdef CMAP256
-            for (fb_scaling == 1) {
-                memcpy(line_out, line_in, SCREENWIDTH); /* fb_width is bigger than Doom SCREENWIDTH... */
-            } else {
-                //XXX FIXME fb_scaling support!
-            }
-#else
-            cmap_to_rgb565((void*)line_out, (void*)line_in, SCREENWIDTH);
-            //cmap_to_fb((void*)line_out, (void*)line_in, SCREENWIDTH);
-#endif
-            line_out += (SCREENWIDTH * fb_scaling * (s_Fb.bits_per_pixel/8)) + x_offset_end;
+    uint8_t* inbuf = I_VideoBuffer;
+    uint8_t* outbuf = I_VideoBuffer_FB;
+
+    for (uint32_t i = 0; i < SCREENHEIGHT; i++) {
+        uint8_t* inbuf_temp = inbuf;
+        uint8_t* outbuf_temp = outbuf;
+        for (uint32_t pix = 0; pix < SCREENWIDTH; pix++) {
+            *outbuf++ = *inbuf;
+            *outbuf++ = *inbuf++;
         }
-        line_in += SCREENWIDTH;
+        memcpy(outbuf, outbuf_temp, SCREENWIDTH * 2);
+        outbuf += SCREENWIDTH * 2;
     }
-#endif
 
-	//memcpy(DG_ScreenBuffer, I_VideoBuffer_FB, (SCREENHEIGHT * fb_scaling * (s_Fb.bits_per_pixel / 8)) * s_Fb.xres);
-    DG_ScreenBuffer = I_VideoBuffer;
+    DG_ScreenBuffer = I_VideoBuffer_FB;
 
 	DG_DrawFrame();
 }