Skip to content

Commit 297cf6d

Browse files
committed
m118: Remove bridge code for legacy GL GrBackendSurface code
commit 2cf149beae3fdb70f689ab3b64b138f1fdd5bd0c Author: Kevin Lubick <[email protected]> Date: Mon Aug 14 10:36:08 2023 -0400 Remove bridge code for legacy GL GrBackendSurface code While doing this, I ran into a small #include issue with GrGLGpu, so I enforced IWYU on it. Client CLs: - https://crrev.com/c/4739911 - http://cl/553620143 - http://cl/553628593 - http://cl/553637942 - http://cl/553705311 - http://cl/553821763 - http://cl/553837992 - http://ag/24343000 - http://ag/24343454 - http://ag/24420576 - http://ag/24445187 - flutter/engine#44334 - flutter/engine#44682 Change-Id: If07cbe3a60593810911c147b8a81e30459623f28 Bug: b/293490566 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/741437 Reviewed-by: Greg Daniel <[email protected]> Reviewed-by: Brian Osman <[email protected]> Commit-Queue: Kevin Lubick <[email protected]>
1 parent 4bc5efe commit 297cf6d

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/skia/GrContext.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <include/gpu/GpuTypes.h>
77
#include <include/gpu/mock/GrMockTypes.h>
88
#include <include/gpu/gl/GrGLInterface.h>
9+
#include <include/gpu/ganesh/gl/GrGLBackendSurface.h>
910
#include <include/gpu/vk/GrVkBackendContext.h>
1011
#include <include/gpu/MutableTextureState.h>
1112
#include <pybind11/chrono.h>
@@ -261,7 +262,7 @@ py::class_<GrBackendSemaphore>(m, "GrBackendSemaphore")
261262
py::class_<GrBackendFormat>(m, "GrBackendFormat")
262263
.def(py::init<>())
263264
.def(py::init<const GrBackendFormat&>())
264-
.def_static("MakeGL", &GrBackendFormat::MakeGL,
265+
.def_static("MakeGL", &GrBackendFormats::MakeGL,
265266
py::arg("format"), py::arg("target"))
266267
/*
267268
.def_static("MakeVk", py::overload_cast<VkFormat>(&GrBackendFormat::MakeVk),
@@ -280,7 +281,7 @@ py::class_<GrBackendFormat>(m, "GrBackendFormat")
280281
.def("backend", &GrBackendFormat::backend)
281282
.def("textureType", &GrBackendFormat::textureType)
282283
.def("channelMask", &GrBackendFormat::channelMask)
283-
.def("asGLFormat", &GrBackendFormat::asGLFormat)
284+
.def("asGLFormat", &GrBackendFormats::AsGLFormat)
284285
/*
285286
.def("asVkFormat", &GrBackendFormat::asVkFormat, py::arg("format"))
286287
.def("getVkYcbcrConversionInfo",
@@ -310,10 +311,10 @@ py::class_<GrBackendTexture>(m, "GrBackendTexture")
310311
.def("height", &GrBackendTexture::height)
311312
.def("hasMipmaps", &GrBackendTexture::hasMipmaps)
312313
.def("backend", &GrBackendTexture::backend)
313-
.def("getGLTextureInfo", &GrBackendTexture::getGLTextureInfo,
314+
.def("getGLTextureInfo", &GrBackendTextures::GetGLTextureInfo,
314315
py::arg("info"))
315316
.def("glTextureParametersModified",
316-
&GrBackendTexture::glTextureParametersModified)
317+
&GrBackendTextures::GLTextureParametersModified)
317318
/*
318319
.def("getVkImageInfo", &GrBackendTexture::getVkImageInfo,
319320
py::arg("info"))
@@ -396,7 +397,7 @@ py::class_<GrBackendRenderTarget>(m, "GrBackendRenderTarget")
396397
.def("stencilBits", &GrBackendRenderTarget::stencilBits)
397398
.def("backend", &GrBackendRenderTarget::backend)
398399
.def("isFramebufferOnly", &GrBackendRenderTarget::isFramebufferOnly)
399-
.def("getGLFramebufferInfo", &GrBackendRenderTarget::getGLFramebufferInfo,
400+
.def("getGLFramebufferInfo", &GrBackendRenderTargets::GetGLFramebufferInfo,
400401
R"docstring(
401402
If the backend API is GL, copies a snapshot of the GrGLFramebufferInfo
402403
struct into the passed in pointer and returns true. Otherwise returns

0 commit comments

Comments
 (0)