Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-enable the vertex loader JIT on OS X. #895

Merged
merged 1 commit into from Aug 28, 2014

Conversation

comex
Copy link
Contributor

@comex comex commented Aug 28, 2014

I can't track down its disabling any further than the following merge. Frankly, it's so simple that I can't see why it would possibly be broken on OS X, and it seems to work fine for me.

commit 5dd502df3b678e04ecc5a5a79af43ecf047b9f92
Merge: 03511d5 7158c14
Author: degasus <wickmarkus@web.de>
Date:   Wed Mar 6 19:07:15 2013 +0100

    Merge branch 'master' into GLSL-master

    the only commit on master is to fix vertexloader, so disable jit for osx

diff --cc Source/Core/VideoCommon/Src/VertexLoader.cpp
index 6c85324,dd8f41c..5e4fbc6a
--- a/Source/Core/VideoCommon/Src/VertexLoader.cpp
+++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp
@@@ -44,8 -44,8 +44,10 @@@
  #include "XFMemory.h"
  extern float GC_ALIGNED16(g_fProjectionMatrix[16]);
  #ifndef _M_GENERIC
++#ifndef __APPLE__
  #define USE_JIT
  #endif
++#endif

  #define COMPILED_CODE_SIZE 4096

Why was it ever disabled?
@pauldacheez
Copy link
Contributor

IIRC, degasus said it caused crashes on the MacBook he borrowed with an Intel HD 4000. I haven’t tested it myself, but then again I had far worse issues with GLSL-master back then.

@degasus
Copy link
Member

degasus commented Aug 28, 2014

iirc this was because of some register saving issue which is likely already fixed. It was definitifly not because of any GPU. So if it works fine for you, I'm fine.

@degasus
Copy link
Member

degasus commented Aug 28, 2014

sorry, it was an alignment issue.

lioncash added a commit that referenced this pull request Aug 28, 2014
Re-enable the vertex loader JIT on OS X.
@lioncash lioncash merged commit aa059ef into dolphin-emu:master Aug 28, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants