Merge remote-tracking branch 'origin/master' into feature/machine_and_kb
This commit is contained in:
@@ -809,9 +809,7 @@ static void opengl_main(void* param)
|
||||
|
||||
static void opengl_blit(int x, int y, int w, int h)
|
||||
{
|
||||
int yy;
|
||||
|
||||
if ((h <= 0) || (buffer32 == NULL) || (thread == NULL) ||
|
||||
if ((x < 0) || (y < 0) || (w <= 0) || (h <= 0) || (w > 2048) || (h > 2048) || (buffer32 == NULL) || (thread == NULL) ||
|
||||
atomic_flag_test_and_set(&blit_info[write_pos].in_use))
|
||||
{
|
||||
video_blit_complete();
|
||||
|
||||
@@ -234,7 +234,7 @@ sdl_blit(int x, int y, int w, int h)
|
||||
SDL_Rect r_src;
|
||||
int ret;
|
||||
|
||||
if (!sdl_enabled || (w <= 0) || (h <= 0) || (w > 2048) || (h > 2048) || (buffer32 == NULL) || (sdl_render == NULL) || (sdl_tex == NULL)) {
|
||||
if (!sdl_enabled || (x < 0) || (y < 0) || (w <= 0) || (h <= 0) || (w > 2048) || (h > 2048) || (buffer32 == NULL) || (sdl_render == NULL) || (sdl_tex == NULL)) {
|
||||
video_blit_complete();
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user