aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/GrShaderCaps.cpp2
-rw-r--r--src/gpu/gl/GrGLAssembleInterface.cpp32
-rw-r--r--src/gpu/gl/GrGLCaps.cpp2
-rw-r--r--src/gpu/gl/GrGLInterface.cpp18
-rw-r--r--src/gpu/gl/GrGLTestInterface.cpp13
5 files changed, 0 insertions, 67 deletions
diff --git a/src/gpu/GrShaderCaps.cpp b/src/gpu/GrShaderCaps.cpp
index a53ea9254b..e31f3300e0 100644
--- a/src/gpu/GrShaderCaps.cpp
+++ b/src/gpu/GrShaderCaps.cpp
@@ -27,7 +27,6 @@ GrShaderCaps::GrShaderCaps(const GrContextOptions& options) {
fDropsTileOnZeroDivide = false;
fFBFetchSupport = false;
fFBFetchNeedsCustomOutput = false;
- fBindlessTextureSupport = false;
fUsesPrecisionModifiers = false;
fCanUseAnyFunctionInShader = true;
fCanUseMinAndAbsTogether = true;
@@ -104,7 +103,6 @@ void GrShaderCaps::dumpJSON(SkJSONWriter* writer) const {
writer->appendBool("FB Fetch Support", fFBFetchSupport);
writer->appendBool("Drops tile on zero divide", fDropsTileOnZeroDivide);
- writer->appendBool("Bindless texture support", fBindlessTextureSupport);
writer->appendBool("Uses precision modifiers", fUsesPrecisionModifiers);
writer->appendBool("Can use any() function", fCanUseAnyFunctionInShader);
writer->appendBool("Can use min() and abs() together", fCanUseMinAndAbsTogether);
diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp
index 9fc5653004..b24fd94d63 100644
--- a/src/gpu/gl/GrGLAssembleInterface.cpp
+++ b/src/gpu/gl/GrGLAssembleInterface.cpp
@@ -366,22 +366,6 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLInterface(void *ctx, GrGLGetProc g
GET_PROC(GetProgramResourceLocation);
}
- if (extensions.has("GL_NV_bindless_texture")) {
- GET_PROC_SUFFIX(GetTextureHandle, NV);
- GET_PROC_SUFFIX(GetTextureSamplerHandle, NV);
- GET_PROC_SUFFIX(MakeTextureHandleResident, NV);
- GET_PROC_SUFFIX(MakeTextureHandleNonResident, NV);
- GET_PROC_SUFFIX(GetImageHandle, NV);
- GET_PROC_SUFFIX(MakeImageHandleResident, NV);
- GET_PROC_SUFFIX(MakeImageHandleNonResident, NV);
- GET_PROC_SUFFIX(IsTextureHandleResident, NV);
- GET_PROC_SUFFIX(IsImageHandleResident, NV);
- GET_PROC_SUFFIX(UniformHandleui64, NV);
- GET_PROC_SUFFIX(UniformHandleui64v, NV);
- GET_PROC_SUFFIX(ProgramUniformHandleui64, NV);
- GET_PROC_SUFFIX(ProgramUniformHandleui64v, NV);
- }
-
if (glVer >= GR_GL_VER(4,3) || extensions.has("GL_KHR_debug")) {
// KHR_debug defines these methods to have no suffix in an OpenGL (not ES) context.
GET_PROC(DebugMessageControl);
@@ -800,22 +784,6 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc
GET_PROC_SUFFIX(CoverageModulation, CHROMIUM);
}
- if (extensions.has("GL_NV_bindless_texture")) {
- GET_PROC_SUFFIX(GetTextureHandle, NV);
- GET_PROC_SUFFIX(GetTextureSamplerHandle, NV);
- GET_PROC_SUFFIX(MakeTextureHandleResident, NV);
- GET_PROC_SUFFIX(MakeTextureHandleNonResident, NV);
- GET_PROC_SUFFIX(GetImageHandle, NV);
- GET_PROC_SUFFIX(MakeImageHandleResident, NV);
- GET_PROC_SUFFIX(MakeImageHandleNonResident, NV);
- GET_PROC_SUFFIX(IsTextureHandleResident, NV);
- GET_PROC_SUFFIX(IsImageHandleResident, NV);
- GET_PROC_SUFFIX(UniformHandleui64, NV);
- GET_PROC_SUFFIX(UniformHandleui64v, NV);
- GET_PROC_SUFFIX(ProgramUniformHandleui64, NV);
- GET_PROC_SUFFIX(ProgramUniformHandleui64v, NV);
- }
-
if (extensions.has("GL_KHR_debug")) {
GET_PROC_SUFFIX(DebugMessageControl, KHR);
GET_PROC_SUFFIX(DebugMessageInsert, KHR);
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index f8d1e50796..0b2e57067f 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -701,8 +701,6 @@ void GrGLCaps::initGLSL(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli
shaderCaps->fUsesPrecisionModifiers = true;
}
- shaderCaps->fBindlessTextureSupport = ctxInfo.hasExtension("GL_NV_bindless_texture");
-
if (kGL_GrGLStandard == standard) {
shaderCaps->fFlatInterpolationSupport = ctxInfo.glslGeneration() >= k130_GrGLSLGeneration;
} else {
diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp
index 0b94a22d23..e52324fbd4 100644
--- a/src/gpu/gl/GrGLInterface.cpp
+++ b/src/gpu/gl/GrGLInterface.cpp
@@ -562,24 +562,6 @@ bool GrGLInterface::validate() const {
}
}
- if (fExtensions.has("GL_NV_bindless_texture")) {
- if (!fFunctions.fGetTextureHandle ||
- !fFunctions.fGetTextureSamplerHandle ||
- !fFunctions.fMakeTextureHandleResident ||
- !fFunctions.fMakeTextureHandleNonResident ||
- !fFunctions.fGetImageHandle ||
- !fFunctions.fMakeImageHandleResident ||
- !fFunctions.fMakeImageHandleNonResident ||
- !fFunctions.fIsTextureHandleResident ||
- !fFunctions.fIsImageHandleResident ||
- !fFunctions.fUniformHandleui64 ||
- !fFunctions.fUniformHandleui64v ||
- !fFunctions.fProgramUniformHandleui64 ||
- !fFunctions.fProgramUniformHandleui64v) {
- RETURN_FALSE_INTERFACE
- }
- }
-
if ((kGL_GrGLStandard == fStandard && glVer >= GR_GL_VER(4,3)) ||
fExtensions.has("GL_KHR_debug")) {
if (!fFunctions.fDebugMessageControl ||
diff --git a/src/gpu/gl/GrGLTestInterface.cpp b/src/gpu/gl/GrGLTestInterface.cpp
index 6e73ffd2f6..38740482f3 100644
--- a/src/gpu/gl/GrGLTestInterface.cpp
+++ b/src/gpu/gl/GrGLTestInterface.cpp
@@ -204,19 +204,6 @@ GrGLTestInterface::GrGLTestInterface() {
fFunctions.fCoverageModulation = bind_to_member(this, &GrGLTestInterface::coverageModulation);
fFunctions.fMultiDrawArraysIndirect = bind_to_member(this, &GrGLTestInterface::multiDrawArraysIndirect);
fFunctions.fMultiDrawElementsIndirect = bind_to_member(this, &GrGLTestInterface::multiDrawElementsIndirect);
- fFunctions.fGetTextureHandle = bind_to_member(this, &GrGLTestInterface::getTextureHandle);
- fFunctions.fGetTextureSamplerHandle = bind_to_member(this, &GrGLTestInterface::getTextureSamplerHandle);
- fFunctions.fMakeTextureHandleResident = bind_to_member(this, &GrGLTestInterface::makeTextureHandleResident);
- fFunctions.fMakeTextureHandleNonResident = bind_to_member(this, &GrGLTestInterface::makeTextureHandleNonResident);
- fFunctions.fGetImageHandle = bind_to_member(this, &GrGLTestInterface::getImageHandle);
- fFunctions.fMakeImageHandleResident = bind_to_member(this, &GrGLTestInterface::makeImageHandleResident);
- fFunctions.fMakeImageHandleNonResident = bind_to_member(this, &GrGLTestInterface::makeImageHandleNonResident);
- fFunctions.fIsTextureHandleResident = bind_to_member(this, &GrGLTestInterface::isTextureHandleResident);
- fFunctions.fIsImageHandleResident = bind_to_member(this, &GrGLTestInterface::isImageHandleResident);
- fFunctions.fUniformHandleui64 = bind_to_member(this, &GrGLTestInterface::uniformHandleui64);
- fFunctions.fUniformHandleui64v = bind_to_member(this, &GrGLTestInterface::uniformHandleui64v);
- fFunctions.fProgramUniformHandleui64 = bind_to_member(this, &GrGLTestInterface::programUniformHandleui64);
- fFunctions.fProgramUniformHandleui64v = bind_to_member(this, &GrGLTestInterface::programUniformHandleui64v);
fFunctions.fFenceSync = bind_to_member(this, &GrGLTestInterface::fenceSync);
fFunctions.fIsSync = bind_to_member(this, &GrGLTestInterface::isSync);
fFunctions.fClientWaitSync = bind_to_member(this, &GrGLTestInterface::clientWaitSync);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 19:41:18 +0000