From 74e0cf216ef25c6011fb29277dc4c77d857b5100 Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Fri, 18 Mar 2022 19:01:16 +0000 Subject: [PATCH] Revert "Add glGetFloatv and glSamplerParameterf to GrGLInterface." This reverts commit 171450a1a0433cbe3e103d9b2163f3c0b9805e25. 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 > Reviewed-by: Robert Phillips > Commit-Queue: Brian Salomon 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 Bot-Commit: Rubber Stamper Reviewed-by: Leon Scroggins Reviewed-by: Brian Salomon Commit-Queue: Brian Salomon --- RELEASE_NOTES.txt | 8 -------- include/gpu/gl/GrGLFunctions.h | 4 +--- include/gpu/gl/GrGLInterface.h | 2 -- src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp | 2 -- src/gpu/gl/GrGLAssembleGLInterfaceAutogen.cpp | 3 --- src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp | 2 -- tools/gpu/gl/interface/interface.json5 | 12 ++---------- 7 files changed, 3 insertions(+), 30 deletions(-) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index e7a8bf1c7f..2dbcb9e9ab 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -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). diff --git a/include/gpu/gl/GrGLFunctions.h b/include/gpu/gl/GrGLFunctions.h index 84724403a9..aef61e065a 100644 --- a/include/gpu/gl/GrGLFunctions.h +++ b/include/gpu/gl/GrGLFunctions.h @@ -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 diff --git a/include/gpu/gl/GrGLInterface.h b/include/gpu/gl/GrGLInterface.h index c28aade61f..af3ca67dcc 100644 --- a/include/gpu/gl/GrGLInterface.h +++ b/include/gpu/gl/GrGLInterface.h @@ -170,7 +170,6 @@ public: GrGLFunction fGetBufferParameteriv; GrGLFunction fGetError; GrGLFunction fGetFramebufferAttachmentParameteriv; - GrGLFunction fGetFloatv; GrGLFunction fGetIntegerv; GrGLFunction fGetMultisamplefv; GrGLFunction fGetProgramBinary; @@ -249,7 +248,6 @@ public: GrGLFunction fBindUniformLocation; GrGLFunction fResolveMultisampleFramebuffer; - GrGLFunction fSamplerParameterf; GrGLFunction fSamplerParameteri; GrGLFunction fSamplerParameteriv; GrGLFunction fScissor; diff --git a/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp b/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp index 2911a383de..f119b00d60 100644 --- a/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp +++ b/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp @@ -91,7 +91,6 @@ sk_sp 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 GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc GET_PROC(BindSampler); GET_PROC(DeleteSamplers); GET_PROC(GenSamplers); - GET_PROC(SamplerParameterf); GET_PROC(SamplerParameteri); GET_PROC(SamplerParameteriv); } diff --git a/src/gpu/gl/GrGLAssembleGLInterfaceAutogen.cpp b/src/gpu/gl/GrGLAssembleGLInterfaceAutogen.cpp index 18e2cdb62b..7f443961bb 100644 --- a/src/gpu/gl/GrGLAssembleGLInterfaceAutogen.cpp +++ b/src/gpu/gl/GrGLAssembleGLInterfaceAutogen.cpp @@ -94,7 +94,6 @@ sk_sp 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 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); } diff --git a/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp b/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp index c8773a8693..6f8736f406 100644 --- a/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp +++ b/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp @@ -98,7 +98,6 @@ sk_sp 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 GrGLMakeAssembledWebGLInterface(void *ctx, GrGLGetPro GET_PROC(BindSampler); GET_PROC(DeleteSamplers); GET_PROC(GenSamplers); - GET_PROC(SamplerParameterf); GET_PROC(SamplerParameteri); GET_PROC(SamplerParameteriv); } diff --git a/tools/gpu/gl/interface/interface.json5 b/tools/gpu/gl/interface/interface.json5 index a3beb8232f..207af58bae 100644 --- a/tools/gpu/gl/interface/interface.json5 +++ b/tools/gpu/gl/interface/interface.json5 @@ -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": ""}], @@ -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"] }, {