Commit graph

2808 commits

Author SHA1 Message Date
strmnnrmn
9eac53d855 [~] Ooops fix Blender.cpp includes
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1154 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:14:04 +00:00
strmnnrmn
2ac0f2c10b [~] Implement InitBlenderMode separately for OSX, which means we can move Blender.cpp to SysPSP, and remove a bunch more sceGu dummy functions.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1153 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:13:56 +00:00
strmnnrmn
fffa6b76a8 [~] Lots of GU_ state flags no longer needed.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1152 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:13:44 +00:00
strmnnrmn
729255a6c9 [~] Split some PSP/OSX functionality, remove sceGuShadeModel dummy function.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1151 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:13:35 +00:00
strmnnrmn
46e540cd66 [-] sceGuTexWeap dummy function is no longer needed.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1150 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:13:25 +00:00
strmnnrmn
a6ce923525 [*] CHECK THIS PLEASE :) I think the call to sceGuTexWrap in EnableTexturing is unnecessary - it's always called immediately before sceGuDrawArray in RendererPSP::RenderUsingRenderSettings
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1149 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:13:15 +00:00
strmnnrmn
77307c858e [-] some sceGuTex* dummy functions are no longer needed.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1148 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:13:08 +00:00
strmnnrmn
d18e76561b [-] sceGuDepth* dummy functions are no longer needed.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1147 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:12:59 +00:00
strmnnrmn
323739e7c9 [-] sceGuAlphaFunc dummy function is no longer needed.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1146 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:12:49 +00:00
strmnnrmn
49ad918e5f [-] sceGuTexFunc dummy function is no longer needed.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1145 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:12:40 +00:00
strmnnrmn
07c7b5b974 [~] Make RestoreRenderStates platform specific.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1144 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:12:31 +00:00
strmnnrmn
f4ea3d320b [~] Nuke dummy sceGuTexMode and sceGuTexImage - they're not needed any more
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1143 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:12:21 +00:00
strmnnrmn
9ba738f2a0 [~] Tidy
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1142 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:12:12 +00:00
strmnnrmn
ecd81b0c0d [~] OSX: sceGuGetMemory dummy function is no longer needed, so delete it
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1141 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:12:05 +00:00
strmnnrmn
3aaa1cda8e [~] Nicer vertex allocation for OSX - no longer uses sceGuGetMemory dummy function
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1140 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:11:56 +00:00
strmnnrmn
3133c86d54 [~] Fix indentation
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1139 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:11:49 +00:00
strmnnrmn
98f4a75241 [~] Add a coule of FIXMEs for zbuffer differences between TextRect, TexRectFlip and FillRect
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1138 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:11:42 +00:00
strmnnrmn
7bbc5a7a39 [~] Rename mN64ToPSP* to mN64ToNative* and wrap the duplicated transform in an inline function.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1137 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:11:35 +00:00
strmnnrmn
d72b33d127 [~] Move DebugBlendSettings to RendererPSP.h
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1136 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:11:26 +00:00
strmnnrmn
2ae5974061 [~] Move mUnhandledCombinerStates to the PSP renderer.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1135 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:11:18 +00:00
strmnnrmn
b32b50b2e5 [~] Move placeholder texture stuff to the PSP renderer.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1134 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:11:08 +00:00
strmnnrmn
c2bb21ef5a [~] ColourAdjuster is only needed for the PSP build.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1133 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:32:24 +00:00
strmnnrmn
1f52aaa0bc [~] Move BlendConstant.{h,cpp} and RenderSettings.{h,cpp} to SysPSP
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1132 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:32:10 +00:00
strmnnrmn
311f69151d [~] mCopyBlendStates/mFillBlendStates are only used by the PSP renderer
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1131 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:31:56 +00:00
strmnnrmn
20bc886504 [~] Move some more displaylist debugging code from BaseRenderer to RendererPSP
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1130 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:08:08 +00:00
strmnnrmn
53a69a2c1f [*] Move BlendModes.{h,cpp}, CombinerExpression.{h,cpp} CombinerTree.{h,cpp} and CombinerInput.h to SysPSP. These aren't needed to compile the OSX build any more.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1129 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:08:00 +00:00
strmnnrmn
5f4df61c5a [~] Move LookupBlendState to the PSP Renderer implementation
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1128 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:07:43 +00:00
strmnnrmn
9230c125e6 [~] Move some PSP specific debugging code to RendererPSP
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1127 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:07:35 +00:00
strmnnrmn
0e288712fb [~] Fix a bunch of warnings and remove some unnecessary casting
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1126 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:07:25 +00:00
strmnnrmn
aebd8b9a33 [~] Ooops - need to prefix paths with HLEGraphics now DisplayListDebugger lives in SysPSP
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1125 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:07:18 +00:00
strmnnrmn
cd1aef1952 [~] Add headers for the PSP/OSX Renderer implementations, and add another pointer to the derived class. This will make it possible to call platform-specific bits of functionality easily.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1124 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:07:11 +00:00
strmnnrmn
75693dd6aa [~] Fix BaseRenderer.h include guard to match filename
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1123 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:06:59 +00:00
strmnnrmn
ca5e2ce912 [~] Move the existing DisplayListDebugger.cpp to SysPSP - it's far too PSP specific to be useful on OSX.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1122 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:06:52 +00:00
strmnnrmn
daaab70972 [~] Shouldn't TexRect and TextRectFlip use the same logic to generate screen coords? TexRectFlip is use by Wetrix's intro screens
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1121 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:06:38 +00:00
strmnnrmn
fc88fe8410 [~] Rename some members with a m_dw prefix
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1120 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:06:31 +00:00
strmnnrmn
ebc7fb07c4 [~] Add a couple of notes to check UV offsets in the texrect code
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1119 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:06:23 +00:00
strmnnrmn
fab757b41f [~] OSX - 2D rendering should use identity matrix
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1118 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:06:17 +00:00
strmnnrmn
462d064f99 [~] OSX - change sceGu calls in DrawTexture* calls to gl calls
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1117 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:06:09 +00:00
strmnnrmn
29155d7e01 [~] Move DrawTexture functions from BaseRenderer to the platform-specific impls
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1116 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:06:01 +00:00
strmnnrmn
05a3fe11d3 [~] Fix whitespace
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1115 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:05:52 +00:00
strmnnrmn
fde6612bb2 [+] Tidy up OSXRenderer
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1114 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:05:45 +00:00
strmnnrmn
7a65e2e525 [+] Implement OSX RenderUsingCurrentBlendMode directly in GL
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1113 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:05:37 +00:00
strmnnrmn
a4b6d43dcd [~] Move all the virtual functions in BlendConstant.h to a separate .cpp file. As these are virtual functions, there's no benefit from declaring them inline, and all it does is bloat the header and slow the build time.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1112 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:05:28 +00:00
strmnnrmn
cc4fa6e600 [~] Make RenderUsingCurrentBlendMode pure virtual and define in the PSP/OSX implementations. Move RenderUsingRenderSettings too. The OSX build can pretty much rewrite all of this code, which I'll do next.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1111 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:05:18 +00:00
strmnnrmn
b7f981544c [~] Add separate OSX/PSP renderers, and instantiate these instead of BaseRenderer
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1110 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-02 16:14:09 +00:00
strmnnrmn
9a77dad8a8 [*] Rename PSPRenderer to BaseRenderer. (PSPRenderer will return, but just with PSP specific bits in it)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1108 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-02 15:46:32 +00:00
strmnnrmn
1e9e443f79 [*] Get rid of the PSPRenderer singleton, and implement as a simple gRenderer pointer. This gets rid of the PSPRenderer typename everywhere, which will make the next step easier (adding an OSXRenderer, and making that and PSPRenderer derive from BaseRenderer. Also in this commit, fixed a bunch of mixed tabs/spaces and formatting.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1107 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-02 15:46:18 +00:00
strmnnrmn
7422eb6f6c [*] Move PixelFormatPSP from SysPSP to common Graphics, rename to NativePixelFormat.h. Remove some of the namespaces to make use of native/n64 pixelformats more obvious when reading the code.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1106 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-02 14:34:51 +00:00
strmnnrmn
c326cd072f [~] OSX: env/prim constants were initialised to crazy values (from debugging).
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1105 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-02 14:34:37 +00:00
strmnnrmn
18e14dcb76 [+] OSX: implement a generic fragment shader that can handle all of the n64's mux/cycle modes
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1104 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-02 10:10:34 +00:00