diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-10-07 14:59:28 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-10-08 11:01:11 +0200 |
| commit | 14ddbba298284685031701591dee1743fecdd7f2 (patch) | |
| tree | 13da9d1248e4fadecd1b9b734872347c6d922021 /src/gui/rhi | |
| parent | ea227fb9152759bcb425c44565651a5032aba134 (diff) | |
rhi: gl: Drop the unused WRAP_R member
If we do not use it for anything, do not spend time on comparing
and copying it either.
Change-Id: I3632792847010e5b73c48eb1ca88f5806f3ccd45
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/gui/rhi')
| -rw-r--r-- | src/gui/rhi/qrhigles2.cpp | 3 | ||||
| -rw-r--r-- | src/gui/rhi/qrhigles2_p_p.h | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/rhi/qrhigles2.cpp b/src/gui/rhi/qrhigles2.cpp index bf473deefb..dc1755ace6 100644 --- a/src/gui/rhi/qrhigles2.cpp +++ b/src/gui/rhi/qrhigles2.cpp @@ -3127,8 +3127,6 @@ void QRhiGles2::bindShaderResources(QGles2CommandBuffer *cbD, f->glTexParameteri(texD->target, GL_TEXTURE_MAG_FILTER, GLint(samplerD->d.glmagfilter)); f->glTexParameteri(texD->target, GL_TEXTURE_WRAP_S, GLint(samplerD->d.glwraps)); f->glTexParameteri(texD->target, GL_TEXTURE_WRAP_T, GLint(samplerD->d.glwrapt)); - // 3D textures not supported by GLES 2.0 or by us atm... - //f->glTexParameteri(texD->target, GL_TEXTURE_WRAP_R, samplerD->d.glwrapr); if (caps.textureCompareMode) { if (samplerD->d.gltexcomparefunc != GL_NEVER) { f->glTexParameteri(texD->target, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE); @@ -4210,7 +4208,6 @@ bool QGles2Sampler::create() d.glmagfilter = toGlMagFilter(m_magFilter); d.glwraps = toGlWrapMode(m_addressU); d.glwrapt = toGlWrapMode(m_addressV); - d.glwrapr = toGlWrapMode(m_addressW); d.gltexcomparefunc = toGlTextureCompareFunc(m_compareOp); generation += 1; diff --git a/src/gui/rhi/qrhigles2_p_p.h b/src/gui/rhi/qrhigles2_p_p.h index 07e0466b30..79f38dffce 100644 --- a/src/gui/rhi/qrhigles2_p_p.h +++ b/src/gui/rhi/qrhigles2_p_p.h @@ -108,7 +108,6 @@ struct QGles2SamplerData GLenum glmagfilter = 0; GLenum glwraps = 0; GLenum glwrapt = 0; - GLenum glwrapr = 0; GLenum gltexcomparefunc = 0; }; @@ -118,7 +117,6 @@ inline bool operator==(const QGles2SamplerData &a, const QGles2SamplerData &b) && a.glmagfilter == b.glmagfilter && a.glwraps == b.glwraps && a.glwrapt == b.glwrapt - && a.glwrapr == b.glwrapr && a.gltexcomparefunc == b.gltexcomparefunc; } |