aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2022-05-31 12:45:58 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2022-06-01 04:46:59 +0200
commit6ce68b9fe99f28376cd2118e2be880936d531946 (patch)
treea71878548015a027b2c97ace6b6ddf95711f3e0a /src
parentba8401d66ea4d862e5a5a91192d1f363ad20fc65 (diff)
Remove unused constant definitions for GL texture import
Amends 1df2cf6bad7207f16ddca17344cc1324e50f287e Change-Id: I6fd6504bf42a37f8bed2d4d8f200ddfa657d6a33 Reviewed-by: JiDe Zhang <zhangjide@uniontech.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/quick/scenegraph/qsgrhisupport.cpp252
1 files changed, 0 insertions, 252 deletions
diff --git a/src/quick/scenegraph/qsgrhisupport.cpp b/src/quick/scenegraph/qsgrhisupport.cpp
index dafbcecc5a..490965bb3f 100644
--- a/src/quick/scenegraph/qsgrhisupport.cpp
+++ b/src/quick/scenegraph/qsgrhisupport.cpp
@@ -262,10 +262,6 @@ void QSGRhiSupport::checkEnvQSgInfo()
#define GL_R32F 0x822E
#endif
-#ifndef GL_HALF_FLOAT
-#define GL_HALF_FLOAT 0x140B
-#endif
-
#ifndef GL_DEPTH_COMPONENT16
#define GL_DEPTH_COMPONENT16 0x81A5
#endif
@@ -278,266 +274,18 @@ void QSGRhiSupport::checkEnvQSgInfo()
#define GL_DEPTH_COMPONENT32F 0x8CAC
#endif
-#ifndef GL_STENCIL_INDEX
-#define GL_STENCIL_INDEX 0x1901
-#endif
-
-#ifndef GL_STENCIL_INDEX8
-#define GL_STENCIL_INDEX8 0x8D48
-#endif
-
#ifndef GL_DEPTH24_STENCIL8
#define GL_DEPTH24_STENCIL8 0x88F0
#endif
-#ifndef GL_DEPTH_STENCIL_ATTACHMENT
-#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
-#endif
-
#ifndef GL_DEPTH_STENCIL
#define GL_DEPTH_STENCIL 0x84F9
#endif
-#ifndef GL_PRIMITIVE_RESTART_FIXED_INDEX
-#define GL_PRIMITIVE_RESTART_FIXED_INDEX 0x8D69
-#endif
-
-#ifndef GL_FRAMEBUFFER_SRGB
-#define GL_FRAMEBUFFER_SRGB 0x8DB9
-#endif
-
-#ifndef GL_READ_FRAMEBUFFER
-#define GL_READ_FRAMEBUFFER 0x8CA8
-#endif
-
-#ifndef GL_DRAW_FRAMEBUFFER
-#define GL_DRAW_FRAMEBUFFER 0x8CA9
-#endif
-
-#ifndef GL_MAX_DRAW_BUFFERS
-#define GL_MAX_DRAW_BUFFERS 0x8824
-#endif
-
-#ifndef GL_TEXTURE_COMPARE_MODE
-#define GL_TEXTURE_COMPARE_MODE 0x884C
-#endif
-
-#ifndef GL_COMPARE_REF_TO_TEXTURE
-#define GL_COMPARE_REF_TO_TEXTURE 0x884E
-#endif
-
-#ifndef GL_TEXTURE_COMPARE_FUNC
-#define GL_TEXTURE_COMPARE_FUNC 0x884D
-#endif
-
-#ifndef GL_MAX_SAMPLES
-#define GL_MAX_SAMPLES 0x8D57
-#endif
-
-#ifndef GL_SHADER_STORAGE_BUFFER
-#define GL_SHADER_STORAGE_BUFFER 0x90D2
-#endif
-
-#ifndef GL_READ_ONLY
-#define GL_READ_ONLY 0x88B8
-#endif
-
-#ifndef GL_WRITE_ONLY
-#define GL_WRITE_ONLY 0x88B9
-#endif
-
-#ifndef GL_READ_WRITE
-#define GL_READ_WRITE 0x88BA
-#endif
-
-#ifndef GL_COMPUTE_SHADER
-#define GL_COMPUTE_SHADER 0x91B9
-#endif
-
-#ifndef GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT
-#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x00000001
-#endif
-
-#ifndef GL_ELEMENT_ARRAY_BARRIER_BIT
-#define GL_ELEMENT_ARRAY_BARRIER_BIT 0x00000002
-#endif
-
-#ifndef GL_UNIFORM_BARRIER_BIT
-#define GL_UNIFORM_BARRIER_BIT 0x00000004
-#endif
-
-#ifndef GL_BUFFER_UPDATE_BARRIER_BIT
-#define GL_BUFFER_UPDATE_BARRIER_BIT 0x00000200
-#endif
-
-#ifndef GL_SHADER_STORAGE_BARRIER_BIT
-#define GL_SHADER_STORAGE_BARRIER_BIT 0x00002000
-#endif
-
-#ifndef GL_TEXTURE_FETCH_BARRIER_BIT
-#define GL_TEXTURE_FETCH_BARRIER_BIT 0x00000008
-#endif
-
-#ifndef GL_SHADER_IMAGE_ACCESS_BARRIER_BIT
-#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x00000020
-#endif
-
-#ifndef GL_PIXEL_BUFFER_BARRIER_BIT
-#define GL_PIXEL_BUFFER_BARRIER_BIT 0x00000080
-#endif
-
-#ifndef GL_TEXTURE_UPDATE_BARRIER_BIT
-#define GL_TEXTURE_UPDATE_BARRIER_BIT 0x00000100
-#endif
-
-#ifndef GL_FRAMEBUFFER_BARRIER_BIT
-#define GL_FRAMEBUFFER_BARRIER_BIT 0x00000400
-#endif
-
-#ifndef GL_ALL_BARRIER_BITS
-#define GL_ALL_BARRIER_BITS 0xFFFFFFFF
-#endif
-
-#ifndef GL_VERTEX_PROGRAM_POINT_SIZE
-#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642
-#endif
-
-#ifndef GL_POINT_SPRITE
-#define GL_POINT_SPRITE 0x8861
-#endif
-
-#ifndef GL_MAP_READ_BIT
-#define GL_MAP_READ_BIT 0x0001
-#endif
-
-#ifndef GL_MAP_WRITE_BIT
-#define GL_MAP_WRITE_BIT 0x0002
-#endif
-
-#ifndef GL_TEXTURE_2D_MULTISAMPLE
-#define GL_TEXTURE_2D_MULTISAMPLE 0x9100
-#endif
-
-#ifndef GL_TEXTURE_EXTERNAL_OES
-#define GL_TEXTURE_EXTERNAL_OES 0x8D65
-#endif
-
-#ifndef GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS
-#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB
-#endif
-
-#ifndef GL_MAX_COMPUTE_WORK_GROUP_COUNT
-#define GL_MAX_COMPUTE_WORK_GROUP_COUNT 0x91BE
-#endif
-
-#ifndef GL_MAX_COMPUTE_WORK_GROUP_SIZE
-#define GL_MAX_COMPUTE_WORK_GROUP_SIZE 0x91BF
-#endif
-
-#ifndef GL_TEXTURE_CUBE_MAP_SEAMLESS
-#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F
-#endif
-
-#ifndef GL_CONTEXT_LOST
-#define GL_CONTEXT_LOST 0x0507
-#endif
-
-#ifndef GL_PROGRAM_BINARY_LENGTH
-#define GL_PROGRAM_BINARY_LENGTH 0x8741
-#endif
-
-#ifndef GL_NUM_PROGRAM_BINARY_FORMATS
-#define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE
-#endif
-
-#ifndef GL_UNPACK_ROW_LENGTH
-#define GL_UNPACK_ROW_LENGTH 0x0CF2
-#endif
-
-#ifndef GL_TEXTURE_3D
-#define GL_TEXTURE_3D 0x806F
-#endif
-
-#ifndef GL_TEXTURE_WRAP_R
-#define GL_TEXTURE_WRAP_R 0x8072
-#endif
-
-#ifndef GL_TEXTURE_RECTANGLE
-#define GL_TEXTURE_RECTANGLE 0x84F5
-#endif
-
-#ifndef GL_TEXTURE_2D_ARRAY
-#define GL_TEXTURE_2D_ARRAY 0x8C1A
-#endif
-
-#ifndef GL_MAX_ARRAY_TEXTURE_LAYERS
-#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF
-#endif
-
-#ifndef GL_MAX_VERTEX_UNIFORM_COMPONENTS
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A
-#endif
-
-#ifndef GL_MAX_FRAGMENT_UNIFORM_COMPONENTS
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#endif
-
-#ifndef GL_MAX_VERTEX_UNIFORM_VECTORS
-#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB
-#endif
-
-#ifndef GL_MAX_FRAGMENT_UNIFORM_VECTORS
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD
-#endif
-
#ifndef GL_RGB10_A2
#define GL_RGB10_A2 0x8059
#endif
-#ifndef GL_UNSIGNED_INT_2_10_10_10_REV
-#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
-#endif
-
-#ifndef GL_MAX_VARYING_COMPONENTS
-#define GL_MAX_VARYING_COMPONENTS 0x8B4B
-#endif
-
-#ifndef GL_MAX_VARYING_FLOATS
-#define GL_MAX_VARYING_FLOATS 0x8B4B
-#endif
-
-#ifndef GL_MAX_VARYING_VECTORS
-#define GL_MAX_VARYING_VECTORS 0x8DFC
-#endif
-
-#ifndef GL_TESS_CONTROL_SHADER
-#define GL_TESS_CONTROL_SHADER 0x8E88
-#endif
-
-#ifndef GL_TESS_EVALUATION_SHADER
-#define GL_TESS_EVALUATION_SHADER 0x8E87
-#endif
-
-#ifndef GL_PATCH_VERTICES
-#define GL_PATCH_VERTICES 0x8E72
-#endif
-
-#ifndef GL_LINE
-#define GL_LINE 0x1B01
-#endif
-
-#ifndef GL_FILL
-#define GL_FILL 0x1B02
-#endif
-
-#ifndef GL_PATCHES
-#define GL_PATCHES 0x000E
-#endif
-
-#ifndef GL_GEOMETRY_SHADER
-#define GL_GEOMETRY_SHADER 0x8DD9
-#endif
-
QRhiTexture::Format QSGRhiSupport::toRhiTextureFormatFromGL(uint format)
{
auto rhiFormat = QRhiTexture::UnknownFormat;