ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #286 from Sonicadvance1/ARM-naming 

Change to ARM's naming convention in DriverDetails.
This commit is contained in:
Pierre Bourdon 2014-04-19 09:01:01 +02:00
parent 5a5e63bdd4 92ec49ac9f
commit 8109163afc
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -295,7 +295,7 @@ void InitDriverInfo()
// These two families are similar enough that they share bugs in their drivers. // These two families are similar enough that they share bugs in their drivers.
if (std::string::npos != srenderer.find("Mali-T")) if (std::string::npos != srenderer.find("Mali-T"))
{ {
driver = DriverDetails::DRIVER_ARM_TXXX; driver = DriverDetails::DRIVER_ARM_MIDGARD;
// Mali drivers provide no way to explicitly find out what video driver is running. // Mali drivers provide no way to explicitly find out what video driver is running.
// This is similar to how we can't find the Nvidia driver version in Windows. // This is similar to how we can't find the Nvidia driver version in Windows.
// Good thing is that ARM introduces a new video driver about once every two years so we can // Good thing is that ARM introduces a new video driver about once every two years so we can
@ -309,9 +309,11 @@ void InitDriverInfo()
else else
version = 300; version = 300;
} }
else if (std::string::npos != srenderer.find("Mali-4")) else if (std::string::npos != srenderer.find("Mali-4") ||
std::string::npos != srenderer.find("Mali-3") ||
std::string::npos != srenderer.find("Mali-2"))
{ {
driver = DriverDetails::DRIVER_ARM_4XX; driver = DriverDetails::DRIVER_ARM_UTGARD;
} }
break; break;
case DriverDetails::VENDOR_MESA: case DriverDetails::VENDOR_MESA:

2
Source/Core/VideoCommon/DriverDetails.cpp
View File

@ -48,7 +48,7 @@ namespace DriverDetails
{OS_ALL, VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, -1, BUG_BROKENBUFFERSTREAM, -1.0, -1.0, true}, {OS_ALL, VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, -1, BUG_BROKENBUFFERSTREAM, -1.0, -1.0, true},
{OS_ALL, VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, -1, BUG_BROKENTEXTURESIZE, -1.0, -1.0, true}, {OS_ALL, VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, -1, BUG_BROKENTEXTURESIZE, -1.0, -1.0, true},
{OS_ALL, VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, -1, BUG_ROTATEDFRAMEBUFFER, 53.0, -1.0, true}, {OS_ALL, VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, -1, BUG_ROTATEDFRAMEBUFFER, 53.0, -1.0, true},
{OS_ALL, VENDOR_ARM, DRIVER_ARM_TXXX, -1, BUG_BROKENBUFFERSTREAM, -1.0, -1.0, true}, {OS_ALL, VENDOR_ARM, DRIVER_ARM_MIDGARD, -1, BUG_BROKENBUFFERSTREAM, -1.0, -1.0, true},
{OS_ALL, VENDOR_MESA, DRIVER_NOUVEAU, -1, BUG_BROKENUBO, 900, 916, true}, {OS_ALL, VENDOR_MESA, DRIVER_NOUVEAU, -1, BUG_BROKENUBO, 900, 916, true},
{OS_ALL, VENDOR_MESA, DRIVER_R600, -1, BUG_BROKENUBO, 900, 913, true}, {OS_ALL, VENDOR_MESA, DRIVER_R600, -1, BUG_BROKENUBO, 900, 913, true},
{OS_ALL, VENDOR_MESA, DRIVER_I965, -1, BUG_BROKENUBO, 900, 920, true}, {OS_ALL, VENDOR_MESA, DRIVER_I965, -1, BUG_BROKENUBO, 900, 920, true},

4
Source/Core/VideoCommon/DriverDetails.h
View File

@ -42,8 +42,8 @@ namespace DriverDetails
DRIVER_R600, // OSS Radeon DRIVER_R600, // OSS Radeon
DRIVER_INTEL, // Official Intel DRIVER_INTEL, // Official Intel
DRIVER_I965, // OSS Intel DRIVER_I965, // OSS Intel
DRIVER_ARM_4XX, // Official Mali driver DRIVER_ARM_MIDGARD, // Official Mali driver
DRIVER_ARM_TXXX, // Official Mali driver DRIVER_ARM_UTGARD, // Official Mali driver
DRIVER_LIMA, // OSS Mali driver DRIVER_LIMA, // OSS Mali driver
DRIVER_QUALCOMM_3XX, // Official Adreno driver 3xx DRIVER_QUALCOMM_3XX, // Official Adreno driver 3xx
DRIVER_QUALCOMM_2XX, // Official Adreno driver 2xx DRIVER_QUALCOMM_2XX, // Official Adreno driver 2xx