edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #3811

Browse source 
3811: Add Intel as vendor to the block list on windows r=def- a=Jupeyy

I also added, that the warning doesnt require to be displayed, as it currently won't help anyway to update the driver.

Should set all Intel users to OGL 2.0 default, they can ofc still manually change the setting as they want

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Jupeyy <jupjopjap@gmail.com>
This commit is contained in:
bors[bot] 2021-05-07 07:52:57 +00:00 committed by GitHub
parent 23b8ad5cc2 a0fdacf54f
commit 1d0253aa67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 67 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/client/backend/opengl/backend_opengl.cpp
View file

@ -333,7 +333,8 @@ bool CCommandProcessorFragment_OpenGL::InitOpenGL(const SCommand_Init *pCommand)
*pCommand->m_pInitError = 0;
int BlocklistMajor = -1, BlocklistMinor = -1, BlocklistPatch = -1;
const char *pErrString = ParseBlocklistDriverVersions(pVendorString, pVersionString, BlocklistMajor, BlocklistMinor, BlocklistPatch);
bool RequiresWarning = false;
const char *pErrString = ParseBlocklistDriverVersions(pVendorString, pVersionString, BlocklistMajor, BlocklistMinor, BlocklistPatch, RequiresWarning);
//if the driver is buggy, and the requested GL version is the default, fallback
if(pErrString != NULL && pCommand->m_RequestedMajor == 3 && pCommand->m_RequestedMinor == 0 && pCommand->m_RequestedPatch == 0)
{
@ -346,7 +347,8 @@ bool CCommandProcessorFragment_OpenGL::InitOpenGL(const SCommand_Init *pCommand)
pCommand->m_pCapabilities->m_ContextPatch = BlocklistPatch;
// set backend error string
*pCommand->m_pErrStringPtr = pErrString;
if(RequiresWarning)
*pCommand->m_pErrStringPtr = pErrString;
*pCommand->m_pInitError = -2;
g_Config.m_GfxDriverIsBlocked = 1;

47
src/engine/client/blocklist_driver.cpp
View file

@ -21,24 +21,37 @@ struct SVersion
}
};
enum EBackendDriverBlockListType
{
BACKEND_DRIVER_BLOCKLIST_TYPE_VERSION = 0,
BACKEND_DRIVER_BLOCKLIST_TYPE_VENDOR,
};
/* TODO: generalize it more for other drivers / vendors */
struct SBackEndDriverBlockList
{
EBackendDriverBlockListType m_BlockListType;
SVersion m_VersionMin;
SVersion m_VersionMax;
const char *m_pVendorName;
// the OpenGL version, that is supported
int m_AllowedMajor;
int m_AllowedMinor;
int m_AllowedPatch;
const char *m_pReason;
bool m_DisplayReason;
const char *m_pOSName;
};
static SBackEndDriverBlockList gs_aBlockList[] = {
{{26, 20, 100, 7800}, {27, 20, 100, 8853}, 2, 0, 0, "This Intel driver version can cause crashes, please update it to a newer version."}};
{BACKEND_DRIVER_BLOCKLIST_TYPE_VENDOR, {26, 20, 100, 7800}, {27, 20, 100, 8853}, "Intel", 2, 0, 0, "This Intel driver version can cause crashes, please update it to a newer version.", false, "windows"}};
const char *ParseBlocklistDriverVersions(const char *pVendorStr, const char *pVersionStr, int &BlocklistMajor, int &BlocklistMinor, int &BlocklistPatch)
const char *ParseBlocklistDriverVersions(const char *pVendorStr, const char *pVersionStr, int &BlocklistMajor, int &BlocklistMinor, int &BlocklistPatch, bool &RequiresWarning)
{
if(str_find_nocase(pVendorStr, "Intel") == NULL)
return NULL;
@ -64,12 +77,32 @@ const char *ParseBlocklistDriverVersions(const char *pVendorStr, const char *pVe
for(const auto &BlockListItem : gs_aBlockList)
{
if(BlockListItem.m_VersionMin <= Version && Version <= BlockListItem.m_VersionMax)
if(str_comp(BlockListItem.m_pOSName, CONF_FAMILY_STRING) == 0)
{
BlocklistMajor = BlockListItem.m_AllowedMajor;
BlocklistMinor = BlockListItem.m_AllowedMinor;
BlocklistPatch = BlockListItem.m_AllowedPatch;
return BlockListItem.m_pReason;
bool DriverBlocked = false;
if(BlockListItem.m_BlockListType == BACKEND_DRIVER_BLOCKLIST_TYPE_VENDOR)
{
if(str_find_nocase(pVendorStr, BlockListItem.m_pVendorName) != NULL)
{
DriverBlocked = true;
}
}
else if(BlockListItem.m_BlockListType == BACKEND_DRIVER_BLOCKLIST_TYPE_VERSION)
{
if(BlockListItem.m_VersionMin <= Version && Version <= BlockListItem.m_VersionMax)
{
DriverBlocked = true;
}
}
if(DriverBlocked)
{
RequiresWarning = BlockListItem.m_DisplayReason;
BlocklistMajor = BlockListItem.m_AllowedMajor;
BlocklistMinor = BlockListItem.m_AllowedMinor;
BlocklistPatch = BlockListItem.m_AllowedPatch;
return BlockListItem.m_pReason;
}
}
}

2
src/engine/client/blocklist_driver.h
View file

@ -1,6 +1,6 @@
#ifndef ENGINE_CLIENT_BLOCKLIST_DRIVER_H
#define ENGINE_CLIENT_BLOCKLIST_DRIVER_H
const char *ParseBlocklistDriverVersions(const char *pVendorStr, const char *pVersionStr, int &BlocklistMajor, int &BlocklistMinor, int &BlocklistPatch);
const char *ParseBlocklistDriverVersions(const char *pVendorStr, const char *pVersionStr, int &BlocklistMajor, int &BlocklistMinor, int &BlocklistPatch, bool &RequiresWarning);
#endif // ENGINE_CLIENT_BLOCKLIST_DRIVER_H

27
src/test/blocklist_driver.cpp
View file

@ -1,37 +1,54 @@
#include <gtest/gtest.h>
#include <base/detect.h>
#include <engine/client/blocklist_driver.h>
TEST(BlocklistDriver, Valid1)
{
#ifdef CONF_FAMILY_WINDOWS
int Major = -1, Minor = -1, Patch = -1;
EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7810", Major, Minor, Patch), "This Intel driver version can cause crashes, please update it to a newer version.");
bool WarningReq = false;
EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7810", Major, Minor, Patch, WarningReq), "This Intel driver version can cause crashes, please update it to a newer version.");
EXPECT_EQ(Major, 2);
EXPECT_EQ(Minor, 0);
EXPECT_EQ(Patch, 0);
#endif
}
TEST(BlocklistDriver, Valid2)
{
#ifdef CONF_FAMILY_WINDOWS
int Major = -1, Minor = -1, Patch = -1;
EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7926", Major, Minor, Patch), "This Intel driver version can cause crashes, please update it to a newer version.");
bool WarningReq = false;
EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7926", Major, Minor, Patch, WarningReq), "This Intel driver version can cause crashes, please update it to a newer version.");
EXPECT_EQ(Major, 2);
EXPECT_EQ(Minor, 0);
EXPECT_EQ(Patch, 0);
#endif
}
TEST(BlocklistDriver, Valid3)
{
#ifdef CONF_FAMILY_WINDOWS
int Major = -1, Minor = -1, Patch = -1;
EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7985", Major, Minor, Patch), "This Intel driver version can cause crashes, please update it to a newer version.");
bool WarningReq = false;
EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7985", Major, Minor, Patch, WarningReq), "This Intel driver version can cause crashes, please update it to a newer version.");
EXPECT_EQ(Major, 2);
EXPECT_EQ(Minor, 0);
EXPECT_EQ(Patch, 0);
#endif
}
TEST(BlocklistDriver, Invalid)
{
int Major, Minor, Patch;
EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 25.20.100.7810", Major, Minor, Patch), NULL);
EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7799", Major, Minor, Patch), NULL);
bool WarningReq = false;
#ifdef CONF_FAMILY_WINDOWS
EXPECT_STREQ(ParseBlocklistDriverVersions("AMD", "Build 25.20.100.7810", Major, Minor, Patch, WarningReq), NULL);
EXPECT_STREQ(ParseBlocklistDriverVersions("NVIDIA", "Build 26.20.100.7799", Major, Minor, Patch, WarningReq), NULL);
#else
EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7985", Major, Minor, Patch, WarningReq), NULL);
EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7799", Major, Minor, Patch, WarningReq), NULL);
#endif
}