delet I_UpdateNoBlit
this didnt do anything anymore
This commit is contained in:
1 parent
9171ddf6f3
commit
57e3a9eeb3
8 files changed
+12
-52
No files matched your search
@@ -50,9 +50,8 @@ const char *VID_GetModeName(INT32 modenum)
|
||||
return "A320x240";
|
||||
}
|
||||
|
||||
void I_UpdateNoBlit(void){}
|
||||
|
||||
void I_FinishUpdate(void) {
|
||||
void I_FinishUpdate(void)
|
||||
{
|
||||
LOGD("FRAME!");
|
||||
(*jni_env)->CallVoidMethod(jni_env, androidVideo, videoFrameCB);
|
||||
}
|
||||
|
||||
@@ -433,10 +433,6 @@ static boolean D_Display(void)
|
||||
R_ExecuteSetViewSize();
|
||||
forcerefresh = true; // force background redraw
|
||||
}
|
||||
|
||||
// draw buffered stuff to screen
|
||||
// Used only by linux GGI version
|
||||
I_UpdateNoBlit();
|
||||
}
|
||||
|
||||
// save the current screen if about to wipe
|
||||
|
||||
@@ -65,13 +65,6 @@ void I_OsPolling(void)
|
||||
I_GetConsoleEvents();
|
||||
}
|
||||
|
||||
//
|
||||
// I_UpdateNoBlit
|
||||
//
|
||||
void I_UpdateNoBlit(void)
|
||||
{
|
||||
}
|
||||
|
||||
//
|
||||
// I_FinishUpdate
|
||||
//
|
||||
|
||||
@@ -384,7 +384,6 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
|
||||
F_DoWipe(fmask);
|
||||
|
||||
I_OsPolling();
|
||||
I_UpdateNoBlit();
|
||||
|
||||
if (rendermode != render_none && drawMenu)
|
||||
{
|
||||
|
||||
@@ -102,10 +102,6 @@ void VID_PrepareModeList(void);
|
||||
*/
|
||||
extern boolean allow_fullscreen;
|
||||
|
||||
/** \brief Update video system without updating frame
|
||||
*/
|
||||
void I_UpdateNoBlit(void);
|
||||
|
||||
/** \brief Update video system with updating frame
|
||||
*/
|
||||
void I_FinishUpdate(void);
|
||||
|
||||
@@ -7527,7 +7527,6 @@ static void M_ConnectIP(INT32 choice)
|
||||
M_DrawTextBox(56, BASEVIDHEIGHT/2-12, 24, 2);
|
||||
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2, 0, "Connecting to server...");
|
||||
I_OsPolling();
|
||||
I_UpdateNoBlit();
|
||||
if (rendermode == render_soft)
|
||||
I_FinishUpdate(); // page flip or blit buffer
|
||||
}
|
||||
|
||||
+10
-4
@@ -289,7 +289,7 @@ static void I_ShutdownConsole(void)
|
||||
{
|
||||
I_OutputMsg("Shutdown tty console\n");
|
||||
consolevent = SDL_FALSE;
|
||||
tcsetattr (STDIN_FILENO, TCSADRAIN, &tty_tc);
|
||||
tcsetattr(STDIN_FILENO, TCSADRAIN, &tty_tc);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -309,7 +309,8 @@ static void I_StartupConsole(void)
|
||||
if (framebuffer)
|
||||
consolevent = SDL_FALSE;
|
||||
|
||||
if (!consolevent) return;
|
||||
if (!consolevent)
|
||||
return;
|
||||
|
||||
if (isatty(STDIN_FILENO)!=1)
|
||||
{
|
||||
@@ -317,6 +318,7 @@ static void I_StartupConsole(void)
|
||||
consolevent = SDL_FALSE;
|
||||
return;
|
||||
}
|
||||
|
||||
memset(&tty_con, 0x00, sizeof(tty_con));
|
||||
tcgetattr (0, &tty_tc);
|
||||
tty_erase = tty_tc.c_cc[VERASE];
|
||||
@@ -378,6 +380,7 @@ void I_GetConsoleEvents(void)
|
||||
tty_con.buffer[tty_con.cursor] = '\0';
|
||||
tty_Back();
|
||||
}
|
||||
|
||||
ev.data1 = KEY_BACKSPACE;
|
||||
}
|
||||
else if (key < ' ') // check if this is a control char
|
||||
@@ -393,7 +396,8 @@ void I_GetConsoleEvents(void)
|
||||
// shut down, most unix programs behave this way
|
||||
I_Quit();
|
||||
}
|
||||
else continue;
|
||||
else
|
||||
continue;
|
||||
}
|
||||
else if (tty_con.cursor < sizeof(tty_con.buffer))
|
||||
{
|
||||
@@ -403,7 +407,9 @@ void I_GetConsoleEvents(void)
|
||||
// print the current line (this is differential)
|
||||
write(STDOUT_FILENO, &key, 1);
|
||||
}
|
||||
if (ev.data1) D_PostEvent(&ev);
|
||||
|
||||
if (ev.data1)
|
||||
D_PostEvent(&ev);
|
||||
//tty_FlushIn();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -155,7 +155,6 @@ static UINT32 localPalette[256];
|
||||
Uint16 realwidth = BASEVIDWIDTH;
|
||||
Uint16 realheight = BASEVIDHEIGHT;
|
||||
#define HalfWarpMouse(x,y) if (wrapmouseok) SDL_WarpMouseInWindow(window, (Uint16)(x/2),(Uint16)(y/2))
|
||||
static SDL_bool exposevideo = SDL_FALSE;
|
||||
static SDL_bool usesdl2soft = SDL_FALSE;
|
||||
static SDL_bool borderlesswindow = SDL_FALSE;
|
||||
|
||||
@@ -1391,31 +1390,6 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// I_UpdateNoBlit
|
||||
//
|
||||
void I_UpdateNoBlit(void)
|
||||
{
|
||||
if (rendermode == render_none)
|
||||
return;
|
||||
|
||||
if (exposevideo)
|
||||
{
|
||||
#ifdef HWRENDER
|
||||
if (rendermode == render_opengl)
|
||||
{
|
||||
OglSdlFinishUpdate(cv_vidwait.value);
|
||||
return;
|
||||
}
|
||||
|
||||
#endif
|
||||
SDL_RenderCopy(renderer, texture, NULL, NULL);
|
||||
SDL_RenderPresent(renderer);
|
||||
}
|
||||
|
||||
exposevideo = SDL_FALSE;
|
||||
}
|
||||
|
||||
//
|
||||
// I_FinishUpdate
|
||||
//
|
||||
@@ -1475,8 +1449,6 @@ void I_FinishUpdate(void)
|
||||
SDL_RenderCopy(renderer, texture, &src_rect, NULL);
|
||||
SDL_RenderPresent(renderer);
|
||||
}
|
||||
|
||||
exposevideo = SDL_FALSE;
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
Reference in new issue
Block a user