Commit graph

875 commits

Author SHA1 Message Date
strmnnrmn
e068c9da98 [~] Rename mRecentTexture* to mBoundTexture*
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1325 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:39:41 +00:00
strmnnrmn
7e9a6f8eb0 [*] Remove mTileScale. No need to cache this, as we can always figure it out from the native texture (less state to keep in sync is better)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1323 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:39:27 +00:00
strmnnrmn
c2b6206b51 [~] RendererPSP::RenderUsingRenderSettings - outer check for mRecentTexture != NULL isn't needed
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1322 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:39:17 +00:00
strmnnrmn
c72b2ce625 [~] STextureInfoSnapshot can use a CNativeTexture
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1316 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:38:35 +00:00
strmnnrmn
240081f9ff [~] Don't store a separate mpWhiteTexture per CachedTexture. Make it a separate attribute of the key (TextureInfo) and cache it directly.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1315 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:38:26 +00:00
strmnnrmn
af29743eab [~] Keep track of NativeTextures, not CachedTextures. I'm going to introduce a new CachedTile type for OSX, and it's simpler for the renderer to only know about the native texture type (common to CachedTexture and CachedTile)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1313 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:38:09 +00:00
strmnnrmn
be4b8e85c4 [~] RenderUsingCurrentBlendMode and DebugBlendmode can use a reference to the texture RefPtr
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1312 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:38:00 +00:00
strmnnrmn
488d105cc4 [~] Move some RDP state to RDPStateManager. RDP.cpp is pretty defunct now...might make more sense to rename RDPStateManager to RDP and reduce typing :)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1292 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:54:52 +00:00
strmnnrmn
3a399c2bc4 [~] Tidy Preferences.cpp
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1279 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:53:19 +00:00
strmnnrmn
9b55ada0a7 [~] GetSystemMemoryUsage and GetVideoMemoryUsage are unused.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1266 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:51:50 +00:00
strmnnrmn
eb159c7a01 [~] Missed a TextureDescriptor.h include
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1260 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:51:02 +00:00
strmnnrmn
a3eee1f6cb [~] CTextureCache doesn't really need to be a pimpl - remove this to avoid a few virtual calls. Remove lots of unused code and tidy.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1257 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:50:36 +00:00
strmnnrmn
058c7de6b5 [~] Rename CTexture to CachedTexture
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1249 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 19:01:41 +00:00
strmnnrmn
079b8315da [~] Tidy Texture a little - GetRecolouredTexture only ever called with c32::White, so remove the arg and rename GetWhiteTexture. UpdateTexture doesn't need to be a member, so make a static function at global scope.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1248 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 19:01:22 +00:00
strmnnrmn
a8b7e322e5 [~] Rename AudioBuffer::Fill to Drain, and remove some tractor lines
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1242 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 19:00:27 +00:00
strmnnrmn
e4373ed185 [~] There's no need for AudioOutput.h to be shared
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1239 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 19:00:01 +00:00
strmnnrmn
0b6ff2d51b [~] AudioOutput::GetReadStatus is unused
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1238 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 18:59:45 +00:00
strmnnrmn
6907cd199a [~] Rename AudioCode to AudioOutput. SysOSX had stuff in AudioHLE, should have been HLEAudio.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1237 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 18:59:34 +00:00
strmnnrmn
80b2be6c34 [+] Add a ToMilliseconds convenience function
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1232 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 14:02:15 +00:00
strmnnrmn
64613de3ce [~] Remove a couple of unnecessary AudioCode member variables
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1228 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 14:01:41 +00:00
strmnnrmn
7ad92840cd [~] WaitForThreadTermination -> JoinThread, and tidy
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1227 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 14:01:31 +00:00
strmnnrmn
48162d9f5b [-] Delete some dead code
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1226 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 14:01:20 +00:00
strmnnrmn
85ff566e35 [~] INVALID_THREAD_HANDLE -> kInvalidThreadHandle (I confuse with Win32 INVALID_HANDLE_VALUE)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1224 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 14:01:04 +00:00
strmnnrmn
41c91d9549 [~] Rename EnableTexturing (which doesn't do any enabling) to UpdateTileSnapshots
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1219 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 14:00:22 +00:00
strmnnrmn
87ab04454c [~] Move the texture setup code from FlushTris to RenderTriangles. That moves some of the last state changes in BaseRenderer to the platform impls. I deleted the GU_CULL_FACE code - we can just rely on the software culling in AddTri.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1215 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 13:59:49 +00:00
strmnnrmn
f2cd817ae8 [~] mN64ToNative{Scale,Translate} -> mN64ToScreen{Scale,Translate}
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1204 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:09:00 +00:00
strmnnrmn
e82f23491e [~] N64ToNative{X,Y} -> N64ToScreen{X,Y}
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1203 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:08:52 +00:00
strmnnrmn
b0e75da33c [~] Rename ConvertN64ToPsp to ConvertN64ToScreen (going to add a ToDisplay version next)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1202 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:08:42 +00:00
strmnnrmn
f18fa4001d [~] Replace RenderUsingCurrentBuildMode virtual with RenderTriangles. The triangle_mode/render_mode args don't need to be passed then, which simplifies the interfaces a bit. On OSX we can get rid of ERenderMode and just pass the matrix to use. On PSP we just pass GU_TRANSFORM_3D/2D as we did previously.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1201 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:08:32 +00:00
strmnnrmn
76b7e5f4da [~] replace spaces with tabs
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1194 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:07:33 +00:00
strmnnrmn
d099a4cb1b [~] Pass an enum to RenderUsingCurrentBlendMode to specify 2d/3d rendering. This lets us remove a bunch more dummy enum values on OSX
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1187 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:06:37 +00:00
strmnnrmn
094d561623 [~] Move TexRect/TexRectFlip/FillRect to the platform renderer implementations - stuff like GU_SPRITES makes the OSX implementation a bit bodgy.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1175 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:27:43 +00:00
strmnnrmn
4c67c3343f [~] Add a FIXME to do with writing out NativePfCI44 textures as pngs. Haven't tested this, but I neede to make a similar fix for OSX
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1171 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:27:09 +00:00
salvy
c00e93dd8d [~] Clean up unnecessary headers and lib
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1164 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-04 18:47:00 +00:00
strmnnrmn
255207596d [!] Compile fix for last fix :)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1162 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 23:06:17 +00:00
strmnnrmn
c8e7fef486 [!] sceGuTexWrap needs to be called in the OverrideFunction path
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1161 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 23:06:09 +00:00
salvy
444a12c3ce [!] Removed checks to avoid necessary viewport update from BeginScene (Is only called once per frame andyways)
[!] Enable memory access opt for LB (Mario 64 doesn't crash anymore with it, still risky, small speed up, let me know if any game stops working with mem opt option)

git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1157 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:20:47 +00:00
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
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
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