corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 47b0285bd66d (bug 1919928) for causing bustages at GLVendor. CLOSED TREE

Browse Source
This commit is contained in:
Butkovits Atila
2024-11-19 00:59:44 +02:00
parent c8b362b6a4
commit 3aeda48069
6 changed files with 62 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dom/canvas/WebGLContextValidate.cpp
View File

@@ -543,8 +543,6 @@ bool WebGLContext::InitAndValidateGL(FailureReason* const out_failReason) {
mFakeVertexAttrib0BufferObject = 0;
// -
mNeedsLegacyVertexAttrib0Handling = gl->IsCompatibilityProfile();
if (gl->WorkAroundDriverBugs() && kIsMacOS) {
// Failures in conformance/attribs/gl-disabled-vertex-attrib.
@@ -558,23 +556,8 @@ bool WebGLContext::InitAndValidateGL(FailureReason* const out_failReason) {
// conformance/attribs/gl-vertex-attrib-unconsumed-out-of-bounds.html
mMaybeNeedsLegacyVertexAttrib0Handling = true;
}
const auto prefVertAttrib0Emulation =
StaticPrefs::webgl_vert_attrib0_emulation();
switch (prefVertAttrib0Emulation) {
case 0:
mNeedsLegacyVertexAttrib0Handling = false;
break;
case 1:
mNeedsLegacyVertexAttrib0Handling = true;
break;
case -1:
default:
break;
}
mMaybeNeedsLegacyVertexAttrib0Handling |= mNeedsLegacyVertexAttrib0Handling;
// -
if (const auto& env =
gfxEnv::MOZ_WEBGL_WORKAROUND_FIRST_AFFECTS_INSTANCE_ID()) {
const auto was = mBug_DrawArraysInstancedUserAttribFetchAffectedByFirst;

8
dom/canvas/WebGLIpdl.h
View File

@@ -282,7 +282,6 @@ struct ParamTraits_IsEnumCase {
struct ParamTraits<T> : public ParamTraits_IsEnumCase<T> {};
USE_IS_ENUM_CASE(mozilla::webgl::OptionalRenderableFormatBits)
USE_IS_ENUM_CASE(mozilla::gl::GLVendor)
#undef USE_IS_ENUM_CASE
@@ -335,6 +334,13 @@ struct ParamTraits<mozilla::webgl::OpaqueFramebufferOptions> final
// -
template <>
struct ParamTraits<mozilla::gl::GLVendor>
: public ContiguousEnumSerializerInclusive<mozilla::gl::GLVendor,
mozilla::gl::GLVendor::Intel,
mozilla::gl::kHighestGLVendor> {
};
template <typename U>
struct ParamTraits<mozilla::webgl::EnumMask<U>> final
: public ParamTraits_TiedFields<mozilla::webgl::EnumMask<U>> {};

168
gfx/gl/GLContext.cpp
View File

@@ -383,90 +383,6 @@ bool GLContext::LoadFeatureSymbols(const SymbolLoader& loader,
return true;
};
// -
static std::optional<std::string> VendorMatchStr(const GLVendor v) {
switch (v) {
case GLVendor::Other:
return "";
case GLVendor::Apple:
return "Apple";
case GLVendor::ARM:
return "ARM";
case GLVendor::ATI:
return "ATI";
case GLVendor::Imagination:
return "Imagination";
case GLVendor::Intel:
return "Intel";
case GLVendor::Nouveau:
return "nouveau";
case GLVendor::NVIDIA:
return "NVIDIA";
case GLVendor::Qualcomm:
return "Qualcomm";
case GLVendor::Vivante:
return "Vivante";
case GLVendor::VMware:
return "VMware, Inc.";
}
return {};
}
bool IsEnumCase(const GLVendor v) { return bool(VendorMatchStr(v)); }
// -
static std::optional<std::string> RendererMatchStr(const GLRenderer v) {
switch (v) {
case GLRenderer::Other:
return "";
case GLRenderer::Adreno200:
return "Adreno 200";
case GLRenderer::Adreno205:
return "Adreno 205";
case GLRenderer::AdrenoTM200:
return "Adreno (TM) 200";
case GLRenderer::AdrenoTM205:
return "Adreno (TM) 205";
case GLRenderer::AdrenoTM305:
return "Adreno (TM) 305";
case GLRenderer::AdrenoTM320:
return "Adreno (TM) 320";
case GLRenderer::AdrenoTM330:
return "Adreno (TM) 330";
case GLRenderer::AdrenoTM420:
return "Adreno (TM) 420";
case GLRenderer::Mali400MP:
return "Mali-400 MP";
case GLRenderer::Mali450MP:
return "Mali-450 MP";
case GLRenderer::MaliT:
return "Mali-T";
case GLRenderer::SGX530:
return "PowerVR SGX 530";
case GLRenderer::SGX540:
return "PowerVR SGX 540";
case GLRenderer::SGX544MP:
return "PowerVR SGX 544MP";
case GLRenderer::Tegra:
return "NVIDIA Tegra";
case GLRenderer::AndroidEmulator:
return "Android Emulator";
case GLRenderer::GalliumLlvmpipe:
return "Gallium 0.4 on llvmpipe";
case GLRenderer::IntelHD3000:
return "Intel HD Graphics 3000 OpenGL Engine";
case GLRenderer::MicrosoftBasicRenderDriver:
return "Microsoft Basic Render Driver";
case GLRenderer::SamsungXclipse:
return "Samsung Xclipse";
}
return {};
}
// -
bool GLContext::InitImpl() {
if (!MakeCurrent(true)) return false;
@@ -714,49 +630,63 @@ bool GLContext::InitImpl() {
////////////////
const auto GetGlString = [&](const GLenum pname) -> std::string {
const auto raw = (const char*)fGetString(pname);
if (!raw) return "";
return raw;
};
const char* glVendorString = (const char*)fGetString(LOCAL_GL_VENDOR);
const char* glRendererString = (const char*)fGetString(LOCAL_GL_RENDERER);
if (!glVendorString || !glRendererString) return false;
const auto vendorStr = GetGlString(LOCAL_GL_VENDOR);
const auto rendererStr = GetGlString(LOCAL_GL_RENDERER);
if (vendorStr == "" || rendererStr == "") return false;
// The order of these strings must match up with the order of the enum
// defined in GLContext.h for vendor IDs.
const char* vendorMatchStrings[size_t(GLVendor::Other) + 1] = {
"Intel", "NVIDIA", "ATI", "Qualcomm", "Imagination",
"nouveau", "Vivante", "VMware, Inc.", "ARM", "Unknown"};
// -
// GLVendor detection
for (int i = 0;; i++) {
const auto e = static_cast<GLVendor>(i);
const auto matchStr = VendorMatchStr(e);
if (!matchStr) break;
if (vendorStr == matchStr) {
mVendor = e;
mVendor = GLVendor::Other;
for (size_t i = 0; i < size_t(GLVendor::Other); ++i) {
if (DoesStringMatch(glVendorString, vendorMatchStrings[i])) {
mVendor = GLVendor(i);
break;
}
}
if (mVendor == GLVendor::Other) {
gfxCriticalNote << "Unrecognized GLVendor: \"" << vendorStr << "\"";
}
// -
// GLRenderer detection
// The order of these strings must match up with the order of the enum
// defined in GLContext.h for renderer IDs.
const char* rendererMatchStrings[size_t(GLRenderer::Other) + 1] = {
"Adreno 200",
"Adreno 205",
"Adreno (TM) 200",
"Adreno (TM) 205",
"Adreno (TM) 305",
"Adreno (TM) 320",
"Adreno (TM) 330",
"Adreno (TM) 420",
"Mali-400 MP",
"Mali-450 MP",
"Mali-T",
"PowerVR SGX 530",
"PowerVR SGX 540",
"PowerVR SGX 544MP",
"NVIDIA Tegra",
"Android Emulator",
"Gallium 0.4 on llvmpipe",
"Intel HD Graphics 3000 OpenGL Engine",
"Microsoft Basic Render Driver",
"Samsung Xclipse",
"Unknown"};
for (int i = 0;; i++) {
const auto e = static_cast<GLRenderer>(i);
const auto matchStr = RendererMatchStr(e);
if (!matchStr) break;
if (rendererStr == matchStr) {
mRenderer = e;
mRenderer = GLRenderer::Other;
for (size_t i = 0; i < size_t(GLRenderer::Other); ++i) {
if (DoesStringMatch(glRendererString, rendererMatchStrings[i])) {
mRenderer = GLRenderer(i);
break;
}
}
if (mRenderer == GLRenderer::Other) {
gfxCriticalNote << "Unrecognized GLRenderer: \"" << rendererStr << "\"";
}
// -
{
const auto versionStr = (const char*)fGetString(LOCAL_GL_VERSION);
if (strstr(versionStr, "Mesa")) {
mIsMesa = true;
}
}
const auto Once = []() {
static bool did = false;
@@ -768,8 +698,10 @@ bool GLContext::InitImpl() {
bool printRenderer = ShouldSpew();
printRenderer |= (kIsDebug && Once());
if (printRenderer) {
printf_stderr("GL_VENDOR: %s\n", vendorStr.c_str());
printf_stderr("GL_RENDERER: %s\n", rendererStr.c_str());
printf_stderr("GL_VENDOR: %s\n", glVendorString);
printf_stderr("mVendor: %s\n", vendorMatchStrings[size_t(mVendor)]);
printf_stderr("GL_RENDERER: %s\n", glRendererString);
printf_stderr("mRenderer: %s\n", rendererMatchStrings[size_t(mRenderer)]);
printf_stderr("mIsMesa: %i\n", int(mIsMesa));
}

8
gfx/gl/GLContext.h
View File

@@ -159,10 +159,7 @@ enum class ContextProfile : uint8_t {
OpenGLES
};
// -
enum class GLRenderer : uint8_t {
Other = 0,
enum class GLRenderer {
Adreno200,
Adreno205,
AdrenoTM200,
@@ -183,10 +180,9 @@ enum class GLRenderer : uint8_t {
IntelHD3000,
MicrosoftBasicRenderDriver,
SamsungXclipse,
Other
};
// -
class GLContext : public GenericAtomicRefCounted, public SupportsWeakPtr {
public:
static MOZ_THREAD_LOCAL(const GLContext*) sCurrentContext;

18
gfx/gl/GLContextTypes.h
View File

@@ -50,21 +50,9 @@ struct GLContextDesc final : public GLContextCreateDesc {
// -
enum class GLVendor : uint8_t {
Other = 0,
Apple,
ARM,
ATI,
Imagination,
Intel,
Nouveau,
NVIDIA,
Qualcomm,
Vivante,
VMware
};
bool IsEnumCase(GLVendor);
MOZ_DEFINE_ENUM_CLASS_WITH_BASE(GLVendor, uint8_t,
(Intel, NVIDIA, ATI, Qualcomm, Imagination,
Nouveau, Vivante, VMware, ARM, Other));
} /* namespace gl */
} /* namespace mozilla */

6
modules/libpref/init/StaticPrefList.yaml
View File

@@ -17197,12 +17197,6 @@
value: true
mirror: always
# 0: force-disable, 1: force-enable, -1: driver-dependent
- name: webgl.vert_attrib0_emulation
type: RelaxedAtomicInt32
value: -1
mirror: always
#---------------------------------------------------------------------------
# Prefs starting with "widget."
#---------------------------------------------------------------------------