ee9b9ba53f
Merge remote-tracking branch 'refs/remotes/Cxbx-Reloaded/master'
2017-04-22 17:27:11 +01:00
a9cb7a7ac8
Introduced GetXboxResourceType
2017-04-22 17:25:52 +01:00
95e417d671
Merge remote-tracking branch 'refs/remotes/Cxbx-Reloaded/master'
2017-04-22 16:05:39 +01:00
1a9b20ad08
Merge pull request #390 from LukeUsher/patrickvl-improvements
...
Patrickvl improvements
2017-04-22 00:04:35 +01:00
cd3d8795b2
Disabled D3DVertexBuffer_GetDesc patch
...
Added X_D3DVERTEXBUFFER_DESC and X_D3DINDEXBUFFER_DESC
Small cleanup
2017-04-21 23:49:08 +01:00
b88a837397
Introduced GetHost* helper functions
2017-04-21 23:43:12 +01:00
cdc1048ec3
Added g_ prefix to two global variables
2017-04-21 23:33:16 +01:00
f3a41a1596
Change EmuD3DActiveTexture into X_D3DPixelContainer's
2017-04-21 23:30:19 +01:00
de02c0146e
Prefer X_D3DCOMMON_TYPE_TEXTURE over reading EmuResource8
2017-04-21 23:28:03 +01:00
f615a900af
Use 0, NULL and nullptr correctly
2017-04-21 23:27:22 +01:00
ced5963a3a
VertexShader handles no longer (ab)use the high-bit.
...
Instead, VshHandleIsVertexShader checks if the handle is a high-enough
memory address (lower addresses are FVF's).
2017-04-21 23:24:12 +01:00
a035124fea
VshHandleIsValidShader must use VshHandleGetVertexShader too
2017-04-21 23:21:32 +01:00
1eb79878ac
Renamed p(b)Data variables into p(b)NativeData where applicable
...
Also corrected D3DVertexBuffer_Lock2 ppVertexBuffer name into
pVertexBuffer
2017-04-21 23:17:57 +01:00
30494a71d3
D3DVertexBuffer_Lock : Corrected ppVertexBuffer name into pVertexBuffer
2017-04-21 23:17:38 +01:00
08045a905b
Fixed typo SetIndcies > SetIndices
2017-04-21 23:14:40 +01:00
b633489295
EmuVerifyResourceIsRegistered skips resources with unknown size or without data earlier
2017-04-21 23:14:17 +01:00
97a665cdd6
Merge commit '4d0b4d539e71cd2dfb93b08039d3c011576bc6d5' into patrickvl-improvements
2017-04-21 23:09:52 +01:00
dfaf3b8480
Additional VertexPatcher::Restore cleanup
2017-04-21 23:05:28 +01:00
59891a7801
Use pPatchDesc->hVertexShader instead of g_CurrentVertexShader
2017-04-21 23:02:46 +01:00
f4495c6ea4
Check actual pointer instead of making indirect assumptions
2017-04-21 22:58:05 +01:00
5033060cea
Backported Dxbx VertexShader conversion improvements
2017-04-21 22:44:47 +01:00
e978649dcf
Corrected use of NULL, 0 and nullptr
...
Also some whitespace removal/insertion, indentation updates and
additional comments
2017-04-21 22:44:42 +01:00
b66460d900
Remove Halo hack
2017-04-21 22:40:46 +01:00
af26fd52b3
Remove HACK: Unreal Championship
2017-04-21 22:40:33 +01:00
1e547ebef5
D3DDevice_DrawIndexedVertices porting from Dxbx
...
D3DDevice_DrawIndexedVertices is responsible for the gamepad (which is
currently very glitchy). This code doesn't fix that, so it's probably
caused in either CxbxUpdateActiveIndexBuffer or VertPatch.Apply
2017-04-21 22:35:16 +01:00
f9e9e3e887
Various improvements
...
In EmuFlushIVB:
* Simpler determination of uiStride
* Convert g_IVBTable to g_pIVBVertexBuffer to avoid overwrites
* Detect overflow of pIVBVertexBuffer
In D3DDevice_SetVertexData4f :
* Detect overflow of g_IVBTblOffs
In VshConvertToken_STREAMDATA_REG :
* X_D3DVSDT_FLOAT2H converts to D3DVSDT_FLOAT4 (and corresponding size)
since VertexPatcher::PatchStream relies on that
2017-04-21 22:28:20 +01:00
af56741140
Merge pull request #389 from LukeUsher/fix-hle-cache-renderstate
...
Fix HLE Cache
2017-04-21 22:19:04 +01:00
398bd7208a
Only clear .ini files rather than the entire folder contents
2017-04-21 12:08:21 +01:00
e160e8ea8a
Fix the resource file
2017-04-21 10:03:09 +01:00
9fc55e631e
Add a menu option to clear the cache.
2017-04-21 09:57:57 +01:00
f566e42205
Make sure the HLECache folder exists before writing to it
2017-04-21 09:57:20 +01:00
f5d0b27134
Init the file paths much earlier, as soon as the EXE is started
...
This allows for the GUI to also access the Cxbx path variable.
2017-04-21 09:57:01 +01:00
4d0b4d539e
VshHandleIsVertexShader check doesn't rely on high-bit anymore (although it still gets set)
2017-04-21 09:39:32 +02:00
11c13b858b
Additional VertexPatcher::Restore cleanup
2017-04-21 09:38:16 +02:00
b483cedca9
Use pPatchDesc->hVertexShader instead of g_CurrentVertexShader
2017-04-21 09:37:51 +02:00
c9abb45b78
Check actual pointer instead of making indirect assumptions
2017-04-21 09:37:13 +02:00
c4e359a41a
Backported Dxbx VertexShader conversion improvements
2017-04-21 09:36:18 +02:00
af5b6e74b4
Corrected use of NULL, 0 and nullptr
...
Also some whitespace removal/insertion, indentation updates and
additional comments
2017-04-21 09:30:30 +02:00
cfa8ae2a1c
Remove Halo hack
2017-04-21 09:17:05 +02:00
68dbb12a82
Remove HACK: Unreal Championship
2017-04-21 09:16:22 +02:00
033ff9fa94
Store DeferredRenderState/DeferredTextureState location in the HLE Cache, as well as BuildVersion and other library versions.
2017-04-21 08:06:14 +01:00
574d1f89cd
Merge pull request #388 from LukeUsher/fix-hle-cache-renderstate
...
Temporarily disabled HLE Caching
2017-04-21 06:47:15 +01:00
3fe48fb76e
no message
2017-04-21 06:46:26 +01:00
5f7203c305
Temporarily disabled HLE Caching
...
This caused a regression that needs a little more work to solve, and the
previous attempt at fixing the regression broke more titles than it
fixed.
I'll investigate and fix this properly over the weekend, but for now,
this will at least get things running again
2017-04-21 06:41:12 +01:00
2466ba7cd0
Merge pull request #387 from LukeUsher/fix-hle-cache-renderstate
...
Workaround for RenderState and HLE Cache
2017-04-21 06:36:51 +01:00
937ff698ad
Workaround for RenderState and HLE Cache
...
Not the best way to solve this, but it does fix the regression.
2017-04-21 06:32:32 +01:00
42e87e7b21
Merge pull request #385 from LukeUsher/log_forward
...
Make LOG_FORWARD only log in debug mode
2017-04-20 21:17:44 +02:00
90b2296dfc
Make LOG_FORWARD only log in debug mode
2017-04-20 19:16:04 +01:00
a88d8f4e64
Merge pull request #384 from LukeUsher/hle-caching
...
Implement HLE Cache
2017-04-20 19:10:10 +01:00
a4eb5183be
Merge branch 'master' into hle-caching
2017-04-20 16:42:43 +01:00
PatrickvL