revert video transfer double buffering

Author: RSDuck

LICENSE.3DSGBA

@@ -0,0 +1,87 @@
+
+3DSGBA:
+Copyright (C) 2014 Steveice10
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ini:
+Copyright (c) 2016 rxi
+
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+SDL_gfx:
+Copyright (C) 2001-2012  Andreas Schiffler
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software
+in a product, an acknowledgment in the product documentation would be
+appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+
+Andreas Schiffler -- aschiffler at ferzkopp dot net
+
+Ne10:
+/*
+ *  Copyright 2012-16 ARM Limited and Contributors.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the name of ARM Limited nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY ARM LIMITED AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL ARM LIMITED AND CONTRIBUTORS BE LIABLE FOR ANY
+ *  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+/*
+ * See: http://opensource.org/licenses/BSD-3-Clause for template
+*/

LICENSE.thirdparty

@@ -51,7 +51,7 @@ static const char *stringsNoYes[] = {"No", "Yes"};
 static char currentRomPath[PATH_LENGTH] = {'\0'};
 
 static Mutex videoLock;
-static u16 *videoTransferBuffer[2];
+static u16 *videoTransferBuffer;
 static int videoTransferBackbuffer = 0;
 static u32 *conversionBuffer;
 
@@ -517,8 +517,7 @@ static inline u32 bbgr_555_to_rgb_888(u16 in) {
 
 void systemDrawScreen() {
 	mutexLock(&videoLock);
-	u16 *dstBuffer = videoTransferBuffer[videoTransferBackbuffer];
-	memcpy(dstBuffer, pix, sizeof(u16) * 256 * 160);
+	memcpy(videoTransferBuffer, pix, sizeof(u16) * 256 * 160);
 	mutexUnlock(&videoLock);
 
 	g_video_frames++;
@@ -615,7 +614,7 @@ int main(int argc, char *argv[]) {
 	threadCreate(&audio_thread, audio_thread_main, NULL, 0x10000, 0x2B, 2);
 	threadStart(&audio_thread);
 
-	for (int i = 0; i < 2; i++) videoTransferBuffer[i] = (u16 *)malloc(256 * 160 * sizeof(u16));
+	videoTransferBuffer = (u16 *)malloc(256 * 160 * sizeof(u16));
 	conversionBuffer = (u32 *)malloc(256 * 160 * sizeof(u32));
 	mutexInit(&videoLock);
 
@@ -659,15 +658,10 @@ int main(int argc, char *argv[]) {
 		inputTransferKeysHeld = keysHeld;
 		mutexUnlock(&inputLock);
 
-		mutexLock(&videoLock);
-		// mutexLock(&videoLock);
-		int frontBuffer = videoTransferBackbuffer;
-		videoTransferBackbuffer ^= 1;
-		mutexUnlock(&videoLock);
-
 		if (emulationRunning && !emulationPaused) {
-			u16 *srcImage16 = videoTransferBuffer[frontBuffer];
-			for (int i = 0; i < 256 * 160; i++) conversionBuffer[i] = bbgr_555_to_rgb_888(srcImage16[i]);
+			mutexLock(&videoLock);
+
+			for (int i = 0; i < 256 * 160; i++) conversionBuffer[i] = bbgr_555_to_rgb_888(videoTransferBuffer[i]);
 
 			u32 *srcImage = conversionBuffer;
 
@@ -722,6 +716,8 @@ int main(int argc, char *argv[]) {
 					}
 				}
 			}
+
+			mutexUnlock(&videoLock);
 		}
 
 		bool actionStopEmulation = false;
@@ -848,7 +844,7 @@ int main(int argc, char *argv[]) {
 	uiDeinit();
 
 	free(conversionBuffer);
-	for (int i = 0; i < 2; i++) free(videoTransferBuffer[i]);
+	free(videoTransferBuffer);
 
 	threadWaitForExit(&audio_thread);
 	threadClose(&audio_thread);