Commit graph

2745 commits

Author SHA1 Message Date
strmnnrmn
8e09006078 [~] Fix alpha test - need to do this in the pixel shader. TODO: implement for copy too.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1192 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:07:16 +00:00
strmnnrmn
bb42c467d9 [~] Clear the buffer before starting.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1191 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:07:08 +00:00
strmnnrmn
6b191776ab [~] Don't think we want sticky keys, at least not yet.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1190 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:07:00 +00:00
strmnnrmn
db9fe60028 [!] Fix crashy OSX renderer
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1189 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:06:53 +00:00
strmnnrmn
6e472952c6 [~] Bodgy input for OSX
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1188 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:06:45 +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
507a9204c7 [~] Shuffle some general state-setting in the OSX renderer a little earlier (kepp all uniform stuff closer together)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1186 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:06:25 +00:00
strmnnrmn
b89c9c3844 [~] More OCD liney-uppy :)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1185 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:06:17 +00:00
strmnnrmn
3e2ba77637 [~] Rename matWorld/matProject vars to mat_world, mat_project
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1184 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:06:09 +00:00
strmnnrmn
a7595a6749 [~] Move mat_world_project variable declaration after chunk of code which modifies mWorldProject (functionally equivalent as it's a reference, but a bit more clear that mat_world_project reflects the changes
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1183 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:06:02 +00:00
strmnnrmn
8fc0f527d4 [~] Rename GetWorldProject to UpdateWorldProject, which is a bit clearer about what it's doing. Also, as it just returns a ref to mWorldProject, just return void and reference this member directly from the calling code. Finally, rename matWorldProject -> mat_world_project
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1182 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:05:55 +00:00
strmnnrmn
10510911ba [~] The VFPU and C versions of SetNewVertexInfo passed different args to sceGuSetMatrix. They're equivalent (both reference the same thing) but it's worth keeping the code consistent
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1181 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:05:47 +00:00
salvy
56be0ba2cc [!] Some clean ups and commenting
[~] Removed offscreen check, only conker needs the format check

git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1180 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 03:18:18 +00:00
strmnnrmn
8f1b1c5086 [~] Remove dummy sceGuDrawArray function
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1179 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:28:21 +00:00
strmnnrmn
bf912598ba [~] Remove some old commented out zfighting hack
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1178 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:28:11 +00:00
strmnnrmn
c3d546a816 [~] Remove some more dummy enum values.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1177 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:28:04 +00:00
strmnnrmn
84dacdd842 [~] Simplify OSX TexRect/FillRect. Remove GU_SPRITES dummy enum value.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1176 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:27:54 +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
1109d49558 [!] Fix NativePfCI44 textures on OSX
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1174 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:27:33 +00:00
strmnnrmn
4c1ce8b38c [~] Move ConvertN64ToPsp to the BaseRenderer header. I'm about to move texrect etc to the platform implementations, and it won't be visible to inline from there.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1173 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:27:25 +00:00
strmnnrmn
5e603bc650 [~] Fix texrects etc where tile topleft is non-zero
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1172 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:27:17 +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
strmnnrmn
5c16e5f415 [!] Fix texture clamping on OSX - apparently GL_CLAMP is not what you expect.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1170 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:27:00 +00:00
strmnnrmn
2a06b2d4a1 [~] Implement copy/fill shaders to fix those modes. Bodgily support GU_SPRITES.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1169 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:26:52 +00:00
strmnnrmn
313e1af02a [~] Compile fix for psp
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1168 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:26:41 +00:00
strmnnrmn
253b9612fc [~] Feels nicer to have these template functions explicitly marked as inline.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1167 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:26:34 +00:00
strmnnrmn
e57fc132c6 [~] Rewrite SetScissor for OSX. Remove sceGuScissor dummy function.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1166 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:26:26 +00:00
strmnnrmn
1aa6f9771a [~] Rewrite UpdateViewport for OSX. Remove sceGuViewport and sceGuOffset dummy functions
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1165 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:26:16 +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
strmnnrmn
510885fa9c [~] ViewportInfo is no longer used
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1160 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 23:06:01 +00:00
salvy
87e337c1a0 [!} Don't need to hack the R4300 jump table when sim doubles is disabled
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1159 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:28:56 +00:00
salvy
494dee846d [!] Opps bad merged
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1158 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:22:45 +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
2b29364a8f [~] Fix some (but not all) TexRect issues on OSX
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1156 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:14:18 +00:00
strmnnrmn
3ad8733c7f [~] Fix palletised textures on OSX
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1155 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:14:11 +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
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