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

Remove (unused) NV_bindless_texture from GL interface

Browse Source 
Change-Id: I232c200c30f348da4f61cd7d6d73f3f3b46e0770
Reviewed-on: https://skia-review.googlesource.com/105984
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2018-02-09 09:32:06 -05:00 committed by Skia Commit-Bot
parent de7220f574
commit 426e6c5cba
10 changed files with 0 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/gpu/GrShaderCaps.h
View File

@ -56,8 +56,6 @@ public:
bool fbFetchNeedsCustomOutput() const { return fFBFetchNeedsCustomOutput; }
bool bindlessTextureSupport() const { return fBindlessTextureSupport; }
const char* versionDeclString() const { return fVersionDeclString; }
const char* fbFetchColorName() const { return fFBFetchColorName; }
@ -257,7 +255,6 @@ private:
bool fDropsTileOnZeroDivide : 1;
bool fFBFetchSupport : 1;
bool fFBFetchNeedsCustomOutput : 1;
bool fBindlessTextureSupport : 1;
bool fUsesPrecisionModifiers : 1;
bool fFlatInterpolationSupport : 1;
bool fPreferFlatInterpolation : 1;

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

@ -230,21 +230,6 @@ typedef GrGLvoid (* GrGLCoverageModulationProc)(GrGLenum components);
typedef GrGLvoid (* GrGLMultiDrawArraysIndirectProc)(GrGLenum mode, const GrGLvoid *indirect, GrGLsizei drawcount, GrGLsizei stride);
typedef GrGLvoid (* GrGLMultiDrawElementsIndirectProc)(GrGLenum mode, GrGLenum type, const GrGLvoid *indirect, GrGLsizei drawcount, GrGLsizei stride);
/* NV_bindless_texture */
typedef GrGLuint64 (* GrGLGetTextureHandleProc)(GrGLuint texture);
typedef GrGLuint64 (* GrGLGetTextureSamplerHandleProc)(GrGLuint texture, GrGLuint sampler);
typedef GrGLvoid (* GrGLMakeTextureHandleResidentProc)(GrGLuint64 handle);
typedef GrGLvoid (* GrGLMakeTextureHandleNonResidentProc)(GrGLuint64 handle);
typedef GrGLuint64 (* GrGLGetImageHandleProc)(GrGLuint texture, GrGLint level, GrGLboolean layered, GrGLint layer, GrGLint format);
typedef GrGLvoid (* GrGLMakeImageHandleResidentProc)(GrGLuint64 handle, GrGLenum access);
typedef GrGLvoid (* GrGLMakeImageHandleNonResidentProc)(GrGLuint64 handle);
typedef GrGLboolean (* GrGLIsTextureHandleResidentProc)(GrGLuint64 handle);
typedef GrGLboolean (* GrGLIsImageHandleResidentProc)(GrGLuint64 handle);
typedef GrGLvoid (* GrGLUniformHandleui64Proc)(GrGLint location, GrGLuint64 v0);
typedef GrGLvoid (* GrGLUniformHandleui64vProc)(GrGLint location, GrGLsizei count, const GrGLuint64 *value);
typedef GrGLvoid (* GrGLProgramUniformHandleui64Proc)(GrGLuint program, GrGLint location, GrGLuint64 v0);
typedef GrGLvoid (* GrGLProgramUniformHandleui64vProc)(GrGLuint program, GrGLint location, GrGLsizei count, const GrGLuint64 *value);
/* ARB_sample_shading */
typedef GrGLvoid (* GrGLMinSampleShadingProc)(GrGLfloat value);

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

@ -308,23 +308,6 @@ public:
/* NV_framebuffer_mixed_samples */
GrGLFunction<GrGLCoverageModulationProc> fCoverageModulation;
/* NV_bindless_texture */
// We use the NVIDIA verson for now because it does not require dynamically uniform handles.
// We may switch the the ARB version and/or omit methods in the future.
GrGLFunction<GrGLGetTextureHandleProc> fGetTextureHandle;
GrGLFunction<GrGLGetTextureSamplerHandleProc> fGetTextureSamplerHandle;
GrGLFunction<GrGLMakeTextureHandleResidentProc> fMakeTextureHandleResident;
GrGLFunction<GrGLMakeTextureHandleNonResidentProc> fMakeTextureHandleNonResident;
GrGLFunction<GrGLGetImageHandleProc> fGetImageHandle;
GrGLFunction<GrGLMakeImageHandleResidentProc> fMakeImageHandleResident;
GrGLFunction<GrGLMakeImageHandleNonResidentProc> fMakeImageHandleNonResident;
GrGLFunction<GrGLIsTextureHandleResidentProc> fIsTextureHandleResident;
GrGLFunction<GrGLIsImageHandleResidentProc> fIsImageHandleResident;
GrGLFunction<GrGLUniformHandleui64Proc> fUniformHandleui64;
GrGLFunction<GrGLUniformHandleui64vProc> fUniformHandleui64v;
GrGLFunction<GrGLProgramUniformHandleui64Proc> fProgramUniformHandleui64;
GrGLFunction<GrGLProgramUniformHandleui64vProc> fProgramUniformHandleui64v;
/* ARB_sample_shading */
GrGLFunction<GrGLMinSampleShadingProc> fMinSampleShading;

2
src/gpu/GrShaderCaps.cpp
View File

@ -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);

32
src/gpu/gl/GrGLAssembleInterface.cpp
View File

@ -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);

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

@ -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 {

18
src/gpu/gl/GrGLInterface.cpp
View File

@ -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 ||

13
src/gpu/gl/GrGLTestInterface.cpp
View File

@ -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);

1
src/sksl/SkSLIRGenerator.cpp
View File

@ -126,7 +126,6 @@ static void fill_caps(const SKSL_CAPS_CLASS& caps,
Program::Settings::Value(caps.name())));
CAP(fbFetchSupport);
CAP(fbFetchNeedsCustomOutput);
CAP(bindlessTextureSupport);
CAP(dropsTileOnZeroDivide);
CAP(flatInterpolationSupport);
CAP(noperspectiveInterpolationSupport);

4
src/sksl/SkSLUtil.h
View File

@ -83,10 +83,6 @@ public:
return false;
}
bool bindlessTextureSupport() const {
return false;
}
bool dropsTileOnZeroDivide() const {
return false;
}