36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
|
From 18b9e99bcc2550515e2f725f1b0c70904068c945 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ken Martin <ken.martin@kitware.com>
|
||
|
|
Date: Mon, 6 Jul 2020 10:48:40 -0400
|
||
|
|
Subject: [PATCH] expose 1d texture options
|
||
|
|
|
||
|
|
They are partially implemented as 2d textures
|
||
|
|
---
|
||
|
|
Rendering/OpenGL2/vtkTextureObject.h | 4 ----
|
||
|
|
1 file changed, 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Rendering/OpenGL2/vtkTextureObject.h b/Rendering/OpenGL2/vtkTextureObject.h
|
||
|
|
index b6dcdf6ba7..fe018c75f9 100644
|
||
|
|
--- a/Rendering/OpenGL2/vtkTextureObject.h
|
||
|
|
+++ b/Rendering/OpenGL2/vtkTextureObject.h
|
||
|
|
@@ -226,9 +226,6 @@ public:
|
||
|
|
bool CreateCubeFromRaw(
|
||
|
|
unsigned int width, unsigned int height, int numComps, int dataType, void* data[6]);
|
||
|
|
|
||
|
|
-// 1D textures are not supported in ES 2.0 or 3.0
|
||
|
|
-#ifndef GL_ES_VERSION_3_0
|
||
|
|
-
|
||
|
|
/**
|
||
|
|
* Create a 1D texture using the PBO.
|
||
|
|
* Eventually we may start supporting creating a texture from subset of data
|
||
|
|
@@ -245,7 +242,6 @@ public:
|
||
|
|
* Create 1D texture from client memory
|
||
|
|
*/
|
||
|
|
bool Create1DFromRaw(unsigned int width, int numComps, int dataType, void* data);
|
||
|
|
-#endif
|
||
|
|
|
||
|
|
/**
|
||
|
|
* Create a 2D texture using the PBO.
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|