From 5ff5ff0b126563adf35458553e76a0ade4ae125b Mon Sep 17 00:00:00 2001 From: zilmar Date: Mon, 12 Oct 2015 07:21:56 +1100 Subject: [PATCH] [Glide64] Remove FixedPoint.asm.cpp --- Source/Glide64/DepthBufferRender.cpp | 32 +++++++++++-- Source/Glide64/FixedPoint.asm.cpp | 72 ---------------------------- Source/Glide64/Gfx_1.3.h | 1 + Source/Glide64/Glide64.vcproj | 8 +--- 4 files changed, 32 insertions(+), 81 deletions(-) delete mode 100644 Source/Glide64/FixedPoint.asm.cpp diff --git a/Source/Glide64/DepthBufferRender.cpp b/Source/Glide64/DepthBufferRender.cpp index 1845d180f..094401ce3 100644 --- a/Source/Glide64/DepthBufferRender.cpp +++ b/Source/Glide64/DepthBufferRender.cpp @@ -85,9 +85,35 @@ static int right_height, left_height; static int right_x, right_dxdy, left_x, left_dxdy; static int left_z, left_dzdy; -extern int imul16(int x, int y); -extern int imul14(int x, int y); -extern int idiv16(int x, int y); +int imul16(int x, int y) +{ + int64_t result; + const int64_t m = (int64_t)(x); + const int64_t n = (int64_t)(y); + + result = (m * n) >> 16; + return (int)(result); +} + +int imul14(int x, int y) +{ + int64_t result; + const int64_t m = (int64_t)(x); + const int64_t n = (int64_t)(y); + + result = (m * n) >> 14; + return (int)(result); +} + +int idiv16(int x, int y) +{ + int64_t result; + const int64_t m = (int64_t)(x); + const int64_t n = (int64_t)(y); + + result = (m << 16) / n; + return (int)(result); +} __inline int iceil(int x) { diff --git a/Source/Glide64/FixedPoint.asm.cpp b/Source/Glide64/FixedPoint.asm.cpp deleted file mode 100644 index ba05e2cb1..000000000 --- a/Source/Glide64/FixedPoint.asm.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* -* Glide64 - Glide video plugin for Nintendo 64 emulators. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/**************************************************************** -; -; Glide64 - Glide Plugin for Nintendo 64 emulators -; Project started on December 29th, 2001 -; -; Authors: -; Dave2001, original author, founded the project in 2001, left it in 2002 -; Gugaman, joined the project in 2002, left it in 2002 -; Sergey 'Gonetz' Lipski, joined the project in 2002, main author since fall of 2002 -; Hiroshi 'KoolSmoky' Morii, joined the project in 2007 -; -;**************************************************************** -; -; To modify Glide64: -; * Write your name and (optional)email, commented by your work, so I know who did it, and so that you can find which parts you modified when it comes time to send it to me. -; * Do NOT send me the whole project or file that you modified. Take out your modified code sections, and tell me where to put them. If people sent the whole thing, I would have many different versions, but no idea how to combine them all. -; -;****************************************************************/ - -#if defined(_MSC_VER) && !defined(_STDINT) -typedef signed __int64 int64_t; -#else -#include -#endif - -int imul14(int x, int y) -{ - int64_t result; - const int64_t m = (int64_t)(x); - const int64_t n = (int64_t)(y); - - result = (m * n) >> 14; - return (int)(result); -} - -int imul16(int x, int y) -{ - int64_t result; - const int64_t m = (int64_t)(x); - const int64_t n = (int64_t)(y); - - result = (m * n) >> 16; - return (int)(result); -} - -int idiv16(int x, int y) -{ - int64_t result; - const int64_t m = (int64_t)(x); - const int64_t n = (int64_t)(y); - - result = (m << 16) / n; - return (int)(result); -} diff --git a/Source/Glide64/Gfx_1.3.h b/Source/Glide64/Gfx_1.3.h index 60e58d131..b14e786c6 100644 --- a/Source/Glide64/Gfx_1.3.h +++ b/Source/Glide64/Gfx_1.3.h @@ -90,6 +90,7 @@ the plugin #include // offsetof #include #include +#include #include #include "GlideExtensions.h" #include "rdp.h" diff --git a/Source/Glide64/Glide64.vcproj b/Source/Glide64/Glide64.vcproj index f2f1e26c1..63995751e 100644 --- a/Source/Glide64/Glide64.vcproj +++ b/Source/Glide64/Glide64.vcproj @@ -199,11 +199,11 @@ > @@ -396,10 +396,6 @@ RelativePath="FBtoScreen.h" > - -