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

Bug 1715690 - Generalize WebGL RENDERER into large buckets. r=lsalzman

Browse Source 
+ Minor reduction in unused flexibility of limits.

Differential Revision: https://phabricator.services.mozilla.com/D117385
This commit is contained in:
Jeff Gilbert
2021-06-14 21:27:08 +00:00
parent fa1e2f4d1b
commit b8764fb04d
9 changed files with 477 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
dom/canvas/ClientWebGLContext.cpp
View File

@@ -11,7 +11,6 @@
#include "HostWebGLContext.h"
#include "js/ScalarType.h" // js::Scalar::Type
#include "mozilla/dom/Document.h"
#include "mozilla/dom/SanitizeRenderer.h"
#include "mozilla/dom/ToJSValue.h"
#include "mozilla/dom/WebGLContextEvent.h"
#include "mozilla/dom/WorkerCommon.h"
@@ -37,6 +36,12 @@
namespace mozilla {
namespace webgl {
std::string SanitizeRenderer(const std::string&);
} // namespace webgl
// -
webgl::NotLostData::NotLostData(ClientWebGLContext& _context)
: context(_context) {}
@@ -1872,10 +1877,12 @@ void ClientWebGLContext::GetParameter(JSContext* cx, GLenum pname,
return;
// 2 ints
case LOCAL_GL_MAX_VIEWPORT_DIMS:
retval.set(CreateAs<dom::Int32Array, const int32_t*>(
cx, this, limits.maxViewportDims, rv));
case LOCAL_GL_MAX_VIEWPORT_DIMS: {
const auto dims =
std::array<uint32_t, 2>{limits.maxViewportDim, limits.maxViewportDim};
retval.set(CreateAs<dom::Int32Array, const int32_t*>(cx, this, dims, rv));
return;
}
// 4 ints
case LOCAL_GL_SCISSOR_BOX:
@@ -1962,7 +1969,8 @@ void ClientWebGLContext::GetParameter(JSContext* cx, GLenum pname,
return;
case LOCAL_GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS:
retval.set(JS::NumberValue(limits.maxTransformFeedbackSeparateAttribs));
retval.set(
JS::NumberValue(webgl::kMaxTransformFeedbackSeparateAttribs));
return;
case LOCAL_GL_MAX_UNIFORM_BUFFER_BINDINGS:
retval.set(JS::NumberValue(limits.maxUniformBufferBindings));
@@ -2063,9 +2071,11 @@ void ClientWebGLContext::GetParameter(JSContext* cx, GLenum pname,
const auto maybe = GetString(driverEnum);
if (maybe) {
std::string renderer = *maybe;
mozilla::dom::SanitizeRenderer(renderer);
retval.set(StringValue(cx, renderer, rv));
std::string str = *maybe;
if (driverEnum == LOCAL_GL_RENDERER) {
str = webgl::SanitizeRenderer(str);
}
retval.set(StringValue(cx, str, rv));
}
return;
}
@@ -2881,11 +2891,11 @@ Maybe<webgl::ErrorInfo> CheckBindBufferRange(
switch (target) {
case LOCAL_GL_TRANSFORM_FEEDBACK_BUFFER:
if (index >= limits.maxTransformFeedbackSeparateAttribs) {
if (index >= webgl::kMaxTransformFeedbackSeparateAttribs) {
const auto info = nsPrintfCString(
"`index` (%u) must be less than "
"MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS (%u).",
index, limits.maxTransformFeedbackSeparateAttribs);
index, webgl::kMaxTransformFeedbackSeparateAttribs);
return fnSome(LOCAL_GL_INVALID_VALUE, info);
}
@@ -6108,7 +6118,7 @@ WebGLShaderJS::WebGLShaderJS(const ClientWebGLContext& webgl, const GLenum type)
WebGLTransformFeedbackJS::WebGLTransformFeedbackJS(
const ClientWebGLContext& webgl)
: webgl::ObjectJS(webgl),
mAttribBuffers(webgl.Limits().maxTransformFeedbackSeparateAttribs) {}
mAttribBuffers(webgl::kMaxTransformFeedbackSeparateAttribs) {}
WebGLVertexArrayJS::WebGLVertexArrayJS(const ClientWebGLContext& webgl)
: webgl::ObjectJS(webgl), mAttribBuffers(webgl.Limits().maxVertexAttribs) {}