Skip to content

S
swiftshader
Commit c71c4506 by Nicolas Capens Committed by Nicolas Capens
Options

Remove Apple-specific CPUID queries.

Bug 18720257 Change-Id: I09c71eb4799e6531b111da7ef8d562513afb7532 Reviewed-on: https://swiftshader-review.googlesource.com/1620Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent fa0cc04a
Showing with 31 additions and 103 deletions
src/Common/CPUID.cpp
......@@ -22,7 +22,6 @@
#include <unistd.h>
#include <sched.h>
#include <sys/types.h>
#include <sys/sysctl.h>
#endif
namespace sw
......@@ -171,107 +170,51 @@ namespace sw
bool CPUID::detectMMX()
{
#if defined(__APPLE__)
int MMX = false;
size_t length = sizeof(MMX);
sysctlbyname("hw.optional.mmx", &MMX, &length, 0, 0);
#else
int registers[4];
cpuid(registers, 1);
return MMX = (registers[3] & 0x00800000) != 0;
#endif
return MMX;
int registers[4];
cpuid(registers, 1);
return MMX = (registers[3] & 0x00800000) != 0;
}
bool CPUID::detectCMOV()
{
#if defined(__APPLE__)
int CMOV = false;
size_t length = sizeof(CMOV);
sysctlbyname("hw.optional.floatingpoint", &CMOV, &length, 0, 0);
#else
int registers[4];
cpuid(registers, 1);
return CMOV = (registers[3] & 0x00008000) != 0;
#endif
return CMOV;
int registers[4];
cpuid(registers, 1);
return CMOV = (registers[3] & 0x00008000) != 0;
}
bool CPUID::detectSSE()
{
#if defined(__APPLE__)
int SSE = false;
size_t length = sizeof(SSE);
sysctlbyname("hw.optional.sse", &SSE, &length, 0, 0);
#else
int registers[4];
cpuid(registers, 1);
return SSE = (registers[3] & 0x02000000) != 0;
#endif
return SSE;
int registers[4];
cpuid(registers, 1);
return SSE = (registers[3] & 0x02000000) != 0;
}
bool CPUID::detectSSE2()
{
#if defined(__APPLE__)
int SSE2 = false;
size_t length = sizeof(SSE2);
sysctlbyname("hw.optional.sse2", &SSE2, &length, 0, 0);
#else
int registers[4];
cpuid(registers, 1);
return SSE2 = (registers[3] & 0x04000000) != 0;
#endif
return SSE2;
int registers[4];
cpuid(registers, 1);
return SSE2 = (registers[3] & 0x04000000) != 0;
}
bool CPUID::detectSSE3()
{
#if defined(__APPLE__)
int SSE3 = false;
size_t length = sizeof(SSE3);
sysctlbyname("hw.optional.sse3", &SSE3, &length, 0, 0);
#else
int registers[4];
cpuid(registers, 1);
return SSE3 = (registers[2] & 0x00000001) != 0;
#endif
return SSE3;
int registers[4];
cpuid(registers, 1);
return SSE3 = (registers[2] & 0x00000001) != 0;
}
bool CPUID::detectSSSE3()
{
#if defined(__APPLE__)
int SSSE3 = false;
size_t length = sizeof(SSSE3);
sysctlbyname("hw.optional.supplementalsse3", &SSSE3, &length, 0, 0);
#else
int registers[4];
cpuid(registers, 1);
return SSSE3 = (registers[2] & 0x00000200) != 0;
#endif
return SSSE3;
int registers[4];
cpuid(registers, 1);
return SSSE3 = (registers[2] & 0x00000200) != 0;
}
bool CPUID::detectSSE4_1()
{
#if defined(__APPLE__)
int SSE4_1 = false;
size_t length = sizeof(SSE4_1);
sysctlbyname("hw.optional.sse4_1", &SSE4_1, &length, 0, 0);
#else
int registers[4];
cpuid(registers, 1);
return SSE4_1 = (registers[2] & 0x00080000) != 0;
#endif
return SSE4_1;
int registers[4];
cpuid(registers, 1);
return SSE4_1 = (registers[2] & 0x00080000) != 0;
}
int CPUID::detectCoreCount()
......@@ -293,13 +236,6 @@ namespace sw
systemAffinityMask >>= 1;
}
#elif defined(__APPLE__)
int MIB[2];
MIB[0] = CTL_HW;
MIB[1] = HW_NCPU;
size_t length = sizeof(cores);
sysctl(MIB, 2, &cores, &length, 0, 0);
#else
cores = sysconf(_SC_NPROCESSORS_ONLN);
#endif
......
src/OpenGL/libEGL/Display.cpp
......@@ -26,7 +26,7 @@
namespace egl
{
typedef std::map<EGLNativeDisplayType, Display*> DisplayMap;
typedef std::map<EGLNativeDisplayType, Display*> DisplayMap;
DisplayMap displays;
egl::Display *Display::getPlatformDisplay(EGLenum platform, EGLNativeDisplayType displayId)
......@@ -89,16 +89,9 @@ static void cpuid(int registers[4], int info)
static bool detectSSE()
{
#if defined(__APPLE__)
int SSE = false;
size_t length = sizeof(SSE);
sysctlbyname("hw.optional.sse", &SSE, &length, 0, 0);
return SSE;
#else
int registers[4];
cpuid(registers, 1);
return (registers[3] & 0x02000000) != 0;
#endif
int registers[4];
cpuid(registers, 1);
return (registers[3] & 0x02000000) != 0;
}
bool Display::initialize()
......@@ -112,7 +105,7 @@ bool Display::initialize()
{
return false;
}
mMinSwapInterval = 0;
mMaxSwapInterval = 4;
......@@ -150,7 +143,7 @@ bool Display::initialize()
for(int depthStencilIndex = 0; depthStencilIndex < sizeof(depthStencilFormats) / sizeof(sw::Format); depthStencilIndex++)
{
sw::Format depthStencilFormat = depthStencilFormats[depthStencilIndex];
// FIXME: enumerate multi-sampling
configSet.add(currentDisplayMode, mMinSwapInterval, mMaxSwapInterval, renderTargetFormat, depthStencilFormat, 0);
......@@ -512,11 +505,11 @@ DisplayMode Display::getDisplayMode() const
#if defined(_WIN32)
HDC deviceContext = GetDC(0);
displayMode.width = ::GetDeviceCaps(deviceContext, HORZRES);
displayMode.height = ::GetDeviceCaps(deviceContext, VERTRES);
unsigned int bpp = ::GetDeviceCaps(deviceContext, BITSPIXEL);
switch(bpp)
{
case 32: displayMode.format = sw::FORMAT_X8R8G8B8; break;
......@@ -525,7 +518,7 @@ DisplayMode Display::getDisplayMode() const
default:
ASSERT(false); // Unexpected display mode color depth
}
ReleaseDC(0, deviceContext);
#else
if(platform == EGL_PLATFORM_X11_EXT)
......@@ -556,4 +549,4 @@ DisplayMode Display::getDisplayMode() const
return displayMode;
}
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment