port doom to new video library

Author: leonardocavagnis

libraries/Arduino_H7_Video/src/Arduino_H7_Video.cpp

@@ -98,7 +98,7 @@ int Arduino_H7_Video::begin() {
   #endif
 
   /* Configure SDRAM */
-  SDRAM.begin(dsi_getFramebufferEnd());
+  SDRAM.begin(dsi_getFramebufferEnd()); //FIXME: SDRAM init after video controller init can cause display glitch at start-up
 
   return 0;
 }

libraries/Arduino_H7_Video/src/dsi.cpp

@@ -321,16 +321,6 @@ uint32_t dsi_getFramebufferEnd(void) {
 	return (FB_BASE_ADDRESS + 2 * (lcd_x_size * lcd_y_size * BYTES_PER_PIXEL));
 }
 
-uint32_t dsi_getNextFrameBuffer() {
-	int fb = pend_buffer++ % 2;
-
-	__HAL_LTDC_LAYER_ENABLE(&(ltdc), fb);
-  	__HAL_LTDC_LAYER_DISABLE(&(ltdc), !fb);
-  	__HAL_LTDC_VERTICAL_BLANKING_RELOAD_CONFIG(&(ltdc));
-
-	return fb ? ltdc.LayerCfg[0].FBStartAdress : ltdc.LayerCfg[1].FBStartAdress;
-}
-
 void dsi_drawCurrentFrameBuffer(void) {
 	int fb = pend_buffer++ % 2;
 

libraries/Arduino_H7_Video/src/dsi.h

@@ -37,7 +37,6 @@ void		dsi_lcdDrawImage(void *pSrc, void *pDst, uint32_t xSize, uint32_t ySize, u
 void		dsi_lcdFillArea(void *pDst, uint32_t xSize, uint32_t ySize, uint32_t ColorMode);
 void		dsi_configueCLUT(uint32_t* clut);
 void		dsi_drawCurrentFrameBuffer(void);
-uint32_t	dsi_getNextFrameBuffer(void);
 uint32_t	dsi_getCurrentFrameBuffer(void);
 uint32_t 	dsi_getActiveFrameBuffer(void);
 uint32_t	dsi_getFramebufferEnd(void);

libraries/doom/src/doomgeneric_arduino.cpp

@@ -2,7 +2,8 @@
 
 #include "Arduino.h"
 #include "mbed.h"
-#include "Portenta_Video.h"
+#include "Arduino_H7_Video.h"
+#include "dsi.h"
 
 #define sleep _sleep
 
@@ -89,8 +90,6 @@ static void addKeyToQueue(int pressed, unsigned char keyCode)
   s_KeyQueueWriteIndex %= KEYQUEUE_SIZE;
 }
 
-struct edid recognized_edid;
-
 uint32_t LCD_X_Size = 0, LCD_Y_Size = 0;
 DMA2D_HandleTypeDef    DMA2D_Handle;
 
@@ -162,30 +161,13 @@ static void DMA2D_Init(uint16_t xsize, uint16_t ysize)
   HAL_DMA2D_PollForTransfer(&DMA2D_Handle, 100);
 }
 
-void DG_Init()
-{
-  int ret = -1;
-
-  ret = anx7625_init(0);
-  if(ret < 0) {
-    printf("Cannot continue, anx7625 init failed.\n");
-    while(1);
-  }
+Arduino_H7_Video display(640, 480, USBCVideo);
 
-  anx7625_wait_hpd_event(0);
-  anx7625_dp_get_edid(0, &recognized_edid);
-  //edid_set_framebuffer_bits_per_pixel(&recognized_edid, 16, 0);
-  //set_display_mode(&recognized_edid, EDID_MODE_720x480_60Hz);
-  //anx7625_dp_start(0, &recognized_edid, EDID_MODE_1280x720_60Hz);
-  anx7625_dp_start(0, &recognized_edid, EDID_MODE_640x480_60Hz);
+uint32_t fbs[2];
 
-  LCD_X_Size = stm32_getXSize();
-  LCD_Y_Size = stm32_getYSize();
-
-  SDRAM.begin(getFramebufferEnd());
-
-  stm32_LCD_Clear(0);
-  stm32_LCD_Clear(0);
+void DG_Init()
+{
+  display.begin();
 }
 
 void DG_OnPaletteReload() {
@@ -224,8 +206,8 @@ static void DMA2D_CopyBuffer(uint32_t *pSrc, uint32_t *pDst)
   uint32_t xPos, yPos, destination;
 
   /*##-1- calculate the destination transfer address  ############*/
-  xPos = (stm32_getXSize() - DOOMGENERIC_RESX) / 2;
-  yPos = (stm32_getYSize() - DOOMGENERIC_RESY) / 2;
+  xPos = (display.width() - DOOMGENERIC_RESX) / 2;
+  yPos = (display.height() - DOOMGENERIC_RESY) / 2;
 
   destination = (uint32_t)pDst; // + ((yPos * stm32_getXSize()) + xPos) * 4;
 
@@ -239,14 +221,15 @@ static void DMA2D_CopyBuffer(uint32_t *pSrc, uint32_t *pDst)
 
 void DG_DrawFrame()
 {
-  uint32_t fb = getNextFrameBuffer();
+  uint32_t fb = dsi_getCurrentFrameBuffer();
 #ifdef CORE_CM7
   //SCB_CleanInvalidateDCache();
   //SCB_InvalidateICache();
   SCB_InvalidateDCache_by_Addr((uint32_t *)fb, DOOMGENERIC_RESX * DOOMGENERIC_RESY * 4);
 #endif
 
   DMA2D_CopyBuffer((uint32_t *)DG_ScreenBuffer, (uint32_t *)fb);
+  dsi_drawCurrentFrameBuffer();
   //handleKeyInput();
 }
 

libraries/doom/src/i_video.c

@@ -114,7 +114,7 @@ int mouse_threshold = 10;
 
 // Gamma correction level to use
 
-int usegamma = 0;
+int usegamma = 2;
 
 typedef struct
 {
@@ -266,6 +266,7 @@ void I_FinishUpdate (void)
     uint8_t* inbuf = I_VideoBuffer;
     uint8_t* outbuf = I_VideoBuffer_FB;
 
+    // this function simply doubles the resolution
     for (uint32_t i = 0; i < SCREENHEIGHT; i++) {
         uint8_t* inbuf_temp = inbuf;
         uint8_t* outbuf_temp = outbuf;