Merge remote-tracking branch 'origin/master' into fh/wince

Makefile

@@ -28,11 +28,11 @@ ifeq ($(HAVE_CLANG),1)
 	CC       = ${CC_PREFIX}clang
 	SHARED   := -fuse-ld=lld
 else
-	CXX      = ${CC_PREFIX}g++
-	CC       = ${CC_PREFIX}gcc
+	CXX      ?= ${CC_PREFIX}g++
+	CC       ?= ${CC_PREFIX}gcc
 	SHARED   :=
 endif
-CC_AS    = ${CC_PREFIX}as
+CC_AS    ?= ${CC_PREFIX}as
 
 MFLAGS   := 
 ASFLAGS  := 
@@ -679,6 +679,7 @@ else ifeq ($(platform), qnx)
 	THREADED_RENDERING_DEFAULT = 1
 	CPUFLAGS += -marm -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp -D__arm__ -DARM_ASM -D__NEON_OPT
 	CFLAGS += -D__QNX__
+	THREADED_RENDERING_DEFAULT = 1
 
 	PLATFORM_EXT := unix
 
@@ -692,6 +693,7 @@ else ifneq (,$(findstring armv,$(platform)))
 	WITH_DYNAREC=arm
 	HAVE_GENERIC_JIT = 0
 	PLATCFLAGS += -DARM
+	THREADED_RENDERING_DEFAULT = 1
 	ifneq (,$(findstring gles,$(platform)))
 		FORCE_GLES = 1
 	endif
@@ -744,10 +746,11 @@ else
 	TARGET := $(TARGET_NAME)_libretro.$(EXT)
 	LDFLAGS += -shared -static-libgcc -static-libstdc++ -Wl,--version-script=link.T -lwinmm -lgdi32
 	GL_LIB := -lopengl32
+	LIBS := -lws2_32
 	PLATFORM_EXT := win32
 	SINGLE_PREC_FLAGS=1
-	CC = gcc
-	CXX = g++
+	CC ?= gcc
+	CXX ?= g++
 ifeq ($(WITH_DYNAREC), x86)
 	LDFLAGS += -m32
 	CFLAGS += -m32

Makefile.common

@@ -13,6 +13,10 @@ ifeq ($(THREADED_RENDERING_DEFAULT), 1)
 CORE_DEFINES += -DTHREADED_RENDERING_DEFAULT
 endif
 
+ifeq ($(THREADED_RENDERING_DEFAULT), 1)
+CORE_DEFINES += -DTHREADED_RENDERING_DEFAULT
+endif
+
 SOURCES_C   :=
 SOURCES_CXX := \
 					$(CORE_DIR)/core/hw/arm7/arm_mem.cpp \

core/hw/arm7/arm7.cpp

@@ -2099,7 +2099,7 @@ void FlushCache()
 
 #if HOST_CPU==CPU_X86 && HOST_OS == OS_WINDOWS
 
-#include <Windows.h>
+#include <windows.h>
 
 // These have to be declared somewhere or linker dies
 u8* ARM::emit_opt=0;

core/hw/maple/maple_devs.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "types.h"
 
+// WARNING: changing the order of this enum or inserting new values will break savestates compatibility
 enum MapleDeviceType
 {
    MDT_SegaController,
@@ -17,6 +18,10 @@ enum MapleDeviceType
    MDT_NaomiJamma,
 
    MDT_None,
+
+   //
+   // Add new device types before this comment
+   //
    MDT_Count,
 };
 

core/hw/pvr/Renderer_if.cpp

@@ -350,7 +350,7 @@ void rend_vblank()
 void check_framebuffer_write()
 {
    u32 fb_size = (FB_R_SIZE.fb_y_size + 1) * (FB_R_SIZE.fb_x_size + FB_R_SIZE.fb_modulus) * 4;
-	fb_watch_addr_start = FB_R_SOF2 & VRAM_MASK;
+	fb_watch_addr_start = (SPG_CONTROL.interlace ? FB_R_SOF2 : FB_R_SOF1) & VRAM_MASK;
 	fb_watch_addr_end = fb_watch_addr_start + fb_size;
 }
 

core/rec-x86/rec_x86_driver.cpp

@@ -749,7 +749,7 @@ bool ngen_Rewrite(size_t& addr,size_t retadr,size_t acc)
 					//found !
 
 					if ((acc >> 26) == 0x38 && !w) {
-						printf("WARNING: SQ AREA READ, %08X from sh4:%08X. THIS IS UNDEFINED ON A REAL DREACMAST.\n", acc, bm_GetBlock(x86e->x86_buff)->addr);
+						printf("WARNING: SQ AREA READ, %08X from sh4:%08X. THIS IS UNDEFINED ON A REAL DREACMAST.\n", acc, bm_GetBlock2(x86e->x86_buff)->addr);
 					}
 
 					if ((acc >> 26) == 0x38) //sq ?

core/rend/gles/gltex.cpp

@@ -967,24 +967,36 @@ void RenderFramebuffer()
 		case FBDE_888:		// 888 RGB
 			for (int y = 0; y < height; y++)
 			{
-				for (int i = 0; i < width; i++)
+				for (int i = 0; i < width; i += 4)
 				{
-					if (addr & 1)
-					{
-						u32 src = pvr_read_area1_32(addr - 1);
-						*dst++ = src >> 16;
-						*dst++ = src >> 8;
-						*dst++ = src;
-					}
-					else
-					{
-						u32 src = pvr_read_area1_32(addr);
-						*dst++ = src >> 24;
-						*dst++ = src >> 16;
-						*dst++ = src >> 8;
-					}
+					u32 src = pvr_read_area1_32(addr);
+					*dst++ = src >> 16;
+					*dst++ = src >> 8;
+					*dst++ = src;
+					*dst++ = 0xFF;
+					addr += 4;
+					if (i + 1 >= width)
+						break;
+					u32 src2 = pvr_read_area1_32(addr);
+					*dst++ = src2 >> 8;
+					*dst++ = src2;
+					*dst++ = src >> 24;
+					*dst++ = 0xFF;
+					addr += 4;
+					if (i + 2 >= width)
+						break;
+					u32 src3 = pvr_read_area1_32(addr);
+					*dst++ = src3;
+					*dst++ = src2 >> 24;
+					*dst++ = src2 >> 16;
+					*dst++ = 0xFF;
+					addr += 4;
+					if (i + 3 >= width)
+						break;
+					*dst++ = src3 >> 24;
+					*dst++ = src3 >> 16;
+					*dst++ = src3 >> 8;
 					*dst++ = 0xFF;
-					addr += bpp;
 				}
 				addr += modulus * bpp;
 			}

jni/Android.mk

@@ -17,6 +17,7 @@ NO_THREADS    := 0
 HAVE_NEON     := 0
 WITH_DYNAREC  :=
 HAVE_CHD      := 1
+THREADED_RENDERING_DEFAULT := 1
 
 HAVE_GL       := 1
 HAVE_OPENGL   := 1