AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Add glGetFloatv and glSamplerParameterf to GrGLInterface."

Browse Source 
This reverts commit 171450a1a0.

Reason for revert: Breaking Google3

Original change's description:
> Add glGetFloatv and glSamplerParameterf to GrGLInterface.
>
>
> Bug: skia:13036
> Change-Id: Ie15e0c2b0ada468b82bced818eec67c32d70126b
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522100
> Auto-Submit: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

Bug: skia:13036
Change-Id: I49fd1701b54d2144454b8e6a7ff948b85808409f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522357
Auto-Submit: Leon Scroggins <scroggo@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Leon Scroggins 2022-03-18 19:01:16 +00:00 committed by SkCQ
parent d640b7e4e2
commit 74e0cf216e
7 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
RELEASE_NOTES.txt
View File

@ -2,19 +2,11 @@ Skia Graphics Release Notes
This file includes a list of high level updates for each milestone release.
Milestone 102
-------------
* Add glGetFloatv and glSamplerParameterf to GrGLInterface.
* * *
Milestone 101
-------------
* Add maxSurfaceSampleCountForColorType(SkColorType ct) in GrContextThreadSafeProxy
* Enums SkAlphaType and SkColorType are broken out into their own header files in include/core/
* * *
Milestone 100
-------------
* Skia now requires C++17 and the corresponding standard library (or newer).

4
include/gpu/gl/GrGLFunctions.h
View File

@ -96,7 +96,6 @@ using GrGLGenVertexArraysFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLsizei n, GrGLuint
using GrGLGetBufferParameterivFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLenum target, GrGLenum pname, GrGLint* params);
using GrGLGetErrorFn = GrGLenum GR_GL_FUNCTION_TYPE();
using GrGLGetFramebufferAttachmentParameterivFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLenum target, GrGLenum attachment, GrGLenum pname, GrGLint* params);
using GrGLGetFloatvFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLenum pname, GrGLfloat* params);
using GrGLGetIntegervFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLenum pname, GrGLint* params);
using GrGLGetMultisamplefvFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLenum pname, GrGLuint index, GrGLfloat* val);
using GrGLGetProgramBinaryFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLuint program, GrGLsizei bufsize, GrGLsizei* length, GrGLenum* binaryFormat, void* binary);
@ -143,8 +142,7 @@ using GrGLReadPixelsFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLint x, GrGLint y, GrGL
using GrGLRenderbufferStorageFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLenum target, GrGLenum internalformat, GrGLsizei width, GrGLsizei height);
using GrGLRenderbufferStorageMultisampleFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLenum target, GrGLsizei samples, GrGLenum internalformat, GrGLsizei width, GrGLsizei height);
using GrGLResolveMultisampleFramebufferFn = GrGLvoid GR_GL_FUNCTION_TYPE();
using GrGLSamplerParameterfFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLuint sampler, GrGLenum pname, GrGLfloat param);
using GrGLSamplerParameteriFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLuint sampler, GrGLenum pname, GrGLint param);
using GrGLSamplerParameteriFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLuint sampler, GrGLenum pname, GrGLint params);
using GrGLSamplerParameterivFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLuint sampler, GrGLenum pname, const GrGLint* params);
using GrGLScissorFn = GrGLvoid GR_GL_FUNCTION_TYPE(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
// GL_CHROMIUM_bind_uniform_location

2
include/gpu/gl/GrGLInterface.h
View File

@ -170,7 +170,6 @@ public:
GrGLFunction<GrGLGetBufferParameterivFn> fGetBufferParameteriv;
GrGLFunction<GrGLGetErrorFn> fGetError;
GrGLFunction<GrGLGetFramebufferAttachmentParameterivFn> fGetFramebufferAttachmentParameteriv;
GrGLFunction<GrGLGetFloatvFn> fGetFloatv;
GrGLFunction<GrGLGetIntegervFn> fGetIntegerv;
GrGLFunction<GrGLGetMultisamplefvFn> fGetMultisamplefv;
GrGLFunction<GrGLGetProgramBinaryFn> fGetProgramBinary;
@ -249,7 +248,6 @@ public:
GrGLFunction<GrGLBindUniformLocationFn> fBindUniformLocation;
GrGLFunction<GrGLResolveMultisampleFramebufferFn> fResolveMultisampleFramebuffer;
GrGLFunction<GrGLSamplerParameterfFn> fSamplerParameterf;
GrGLFunction<GrGLSamplerParameteriFn> fSamplerParameteri;
GrGLFunction<GrGLSamplerParameterivFn> fSamplerParameteriv;
GrGLFunction<GrGLScissorFn> fScissor;

2
src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp
View File

@ -91,7 +91,6 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc
GET_PROC(GenTextures);
GET_PROC(GetBufferParameteriv);
GET_PROC(GetError);
GET_PROC(GetFloatv);
GET_PROC(GetIntegerv);
GET_PROC(GetProgramInfoLog);
GET_PROC(GetProgramiv);
@ -426,7 +425,6 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc
GET_PROC(BindSampler);
GET_PROC(DeleteSamplers);
GET_PROC(GenSamplers);
GET_PROC(SamplerParameterf);
GET_PROC(SamplerParameteri);
GET_PROC(SamplerParameteriv);
}

3
src/gpu/gl/GrGLAssembleGLInterfaceAutogen.cpp
View File

@ -94,7 +94,6 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLInterface(void *ctx, GrGLGetProc g
GET_PROC(GenTextures);
GET_PROC(GetBufferParameteriv);
GET_PROC(GetError);
GET_PROC(GetFloatv);
GET_PROC(GetIntegerv);
GET_PROC(GetProgramInfoLog);
GET_PROC(GetProgramiv);
@ -422,14 +421,12 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLInterface(void *ctx, GrGLGetProc g
GET_PROC(BindSampler);
GET_PROC(DeleteSamplers);
GET_PROC(GenSamplers);
GET_PROC(SamplerParameterf);
GET_PROC(SamplerParameteri);
GET_PROC(SamplerParameteriv);
} else if (extensions.has("GL_ARB_sampler_objects")) {
GET_PROC(BindSampler);
GET_PROC(DeleteSamplers);
GET_PROC(GenSamplers);
GET_PROC(SamplerParameterf);
GET_PROC(SamplerParameteri);
GET_PROC(SamplerParameteriv);
}

2
src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp
View File

@ -98,7 +98,6 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledWebGLInterface(void *ctx, GrGLGetPro
GET_PROC(GenTextures);
GET_PROC(GetBufferParameteriv);
GET_PROC(GetError);
GET_PROC(GetFloatv);
GET_PROC(GetIntegerv);
GET_PROC(GetProgramInfoLog);
GET_PROC(GetProgramiv);
@ -240,7 +239,6 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledWebGLInterface(void *ctx, GrGLGetPro
GET_PROC(BindSampler);
GET_PROC(DeleteSamplers);
GET_PROC(GenSamplers);
GET_PROC(SamplerParameterf);
GET_PROC(SamplerParameteri);
GET_PROC(SamplerParameteriv);
}

12
tools/gpu/gl/interface/interface.json5
View File

@ -32,7 +32,7 @@
"EnableVertexAttribArray", "Finish", "Flush",
"FrontFace", "GenBuffers",
"GenTextures", "GetBufferParameteriv", "GetError",
"GetFloatv", "GetIntegerv", "GetProgramInfoLog",
"GetIntegerv", "GetProgramInfoLog",
"GetProgramiv", "GetShaderInfoLog",
"GetShaderiv", "GetString",
"GetUniformLocation", "IsTexture", "LineWidth", "LinkProgram", "PixelStorei",
@ -46,11 +46,6 @@
"VertexAttrib2fv", "VertexAttrib3fv", "VertexAttrib4fv", "VertexAttribPointer",
"Viewport",
],
// TODO: Remove 'optional' once Chrome sets this function in the interface.
"optional": [
"GetFloatv",
]
},
{ // GL exclusive core functions
"GL": [{"ext": "<core>"}],
@ -615,11 +610,8 @@
"functions": [
"BindSampler", "DeleteSamplers", "GenSamplers",
"SamplerParameterf", "SamplerParameteri", "SamplerParameteriv",
"SamplerParameteri", "SamplerParameteriv",
],
// TODO: Remove 'optional' once Chrome sets this function in the interface.
"optional": ["SamplerParameterf"]
},
{