Some renaming

Change-Id: I3256b1c18dcfb015648b7be4ad0c3cfff023f6f9

20 files changed, 29 insertions, 29 deletions

diff --git a/src/plugins/renderers/rhi/graphicshelpers/graphicscontext.cpp b/src/plugins/renderers/rhi/graphicshelpers/graphicscontext.cpp
index 761478969..3358f47f3 100644
--- a/src/plugins/renderers/rhi/graphicshelpers/graphicscontext.cpp
+++ b/src/plugins/renderers/rhi/graphicshelpers/graphicscontext.cpp
@@ -57,13 +57,13 @@
 #include <Qt3DRender/private/qbuffer_p.h>
 #include <Qt3DRender/private/renderstateset_p.h>
 #include <QOpenGLShaderProgram>
-#include <glresourcemanagers_p.h>
+#include <resourcemanagers_p.h>
 #include <graphicshelperinterface_p.h>
 #include <texture_p.h>
 #include <rendercommand_p.h>
 #include <renderer_p.h>
 #include <renderbuffer_p.h>
-#include <glshader_p.h>
+#include <shader_p.h>
 
 #if !defined(QT_OPENGL_ES_2)
 #include <QOpenGLFunctions_2_0>
diff --git a/src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h b/src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h
index 6f45d17fa..0583e3f11 100644
--- a/src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h
+++ b/src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h
@@ -68,8 +68,8 @@
 #include <Qt3DRender/private/qgraphicsapifilter_p.h>
 #include <Qt3DRender/private/uniform_p.h>
 #include <Qt3DRender/private/qblitframebuffer_p.h>
-#include <gl_handle_types_p.h>
-#include <glbuffer_p.h>
+#include <handle_types_p.h>
+#include <buffer_p.h>
 #include <shaderparameterpack_p.h>
 #include <graphicshelperinterface_p.h>
 #include <qmath.h>
diff --git a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp
index 4bccac440..f7ba1815d 100644
--- a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp
+++ b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp
@@ -60,9 +60,9 @@
 #include <rendercommand_p.h>
 #include <graphicshelperinterface_p.h>
 #include <renderer_p.h>
-#include <glresourcemanagers_p.h>
+#include <resourcemanagers_p.h>
 #include <renderbuffer_p.h>
-#include <glshader_p.h>
+#include <shader_p.h>
 #include <openglvertexarrayobject_p.h>
 #include <QOpenGLShaderProgram>
 
diff --git a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext_p.h b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext_p.h
index a88b62a2c..602dc7e35 100644
--- a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext_p.h
+++ b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext_p.h
@@ -53,8 +53,8 @@
 //
 
 
-#include <glbuffer_p.h>
-#include <glfence_p.h>
+#include <buffer_p.h>
+#include <fence_p.h>
 #include <graphicscontext_p.h>
 #include <texturesubmissioncontext_p.h>
 #include <imagesubmissioncontext_p.h>
diff --git a/src/plugins/renderers/rhi/io/glbuffer.cpp b/src/plugins/renderers/rhi/io/buffer.cpp
index ff39fc75c..d8ed97e30 100644
--- a/src/plugins/renderers/rhi/io/glbuffer.cpp
+++ b/src/plugins/renderers/rhi/io/buffer.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "glbuffer_p.h"
+#include "buffer_p.h"
 #include <graphicscontext_p.h>
 
 #if !defined(GL_UNIFORM_BUFFER)
diff --git a/src/plugins/renderers/rhi/io/glbuffer_p.h b/src/plugins/renderers/rhi/io/buffer_p.h
index 49c88a50e..49c88a50e 100644
--- a/src/plugins/renderers/rhi/io/glbuffer_p.h
+++ b/src/plugins/renderers/rhi/io/buffer_p.h
diff --git a/src/plugins/renderers/rhi/io/io.pri b/src/plugins/renderers/rhi/io/io.pri
index 462978c4d..ed86c5f86 100644
--- a/src/plugins/renderers/rhi/io/io.pri
+++ b/src/plugins/renderers/rhi/io/io.pri
@@ -1,8 +1,8 @@
 INCLUDEPATH += $$PWD
 
 SOURCES += \
-    $$PWD/glbuffer.cpp
+    $$PWD/buffer.cpp
 
 HEADERS += \
-    $$PWD/glbuffer_p.h
+    $$PWD/buffer_p.h
 
diff --git a/src/plugins/renderers/rhi/managers/gl_handle_types_p.h b/src/plugins/renderers/rhi/managers/handle_types_p.h
index 06ecab34d..06ecab34d 100644
--- a/src/plugins/renderers/rhi/managers/gl_handle_types_p.h
+++ b/src/plugins/renderers/rhi/managers/handle_types_p.h
diff --git a/src/plugins/renderers/rhi/managers/managers.pri b/src/plugins/renderers/rhi/managers/managers.pri
index 97a4c2c45..888cfec8b 100644
--- a/src/plugins/renderers/rhi/managers/managers.pri
+++ b/src/plugins/renderers/rhi/managers/managers.pri
@@ -1,8 +1,8 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/gl_handle_types_p.h \
-    $$PWD/glresourcemanagers_p.h
+    $$PWD/handle_types_p.h \
+    $$PWD/resourcemanagers_p.h
 
 SOURCES += \
-    $$PWD/glresourcemanagers.cpp
+    $$PWD/resourcemanagers.cpp
diff --git a/src/plugins/renderers/rhi/managers/glresourcemanagers.cpp b/src/plugins/renderers/rhi/managers/resourcemanagers.cpp
index 4dfe56097..936ef3e17 100644
--- a/src/plugins/renderers/rhi/managers/glresourcemanagers.cpp
+++ b/src/plugins/renderers/rhi/managers/resourcemanagers.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "glresourcemanagers_p.h"
+#include "resourcemanagers_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/renderers/rhi/managers/glresourcemanagers_p.h b/src/plugins/renderers/rhi/managers/resourcemanagers_p.h
index 2266bb6eb..ac713ca12 100644
--- a/src/plugins/renderers/rhi/managers/glresourcemanagers_p.h
+++ b/src/plugins/renderers/rhi/managers/resourcemanagers_p.h
@@ -54,10 +54,10 @@
 #include <Qt3DRender/private/qt3drender_global_p.h>
 #include <Qt3DCore/private/qresourcemanager_p.h>
 #include <texture_p.h>
-#include <glbuffer_p.h>
-#include <glfence_p.h>
+#include <buffer_p.h>
+#include <fence_p.h>
 #include <openglvertexarrayobject_p.h>
-#include <glshader_p.h>
+#include <shader_p.h>
 #include <Qt3DRender/private/apishadermanager_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/renderers/rhi/renderer/glfence_p.h b/src/plugins/renderers/rhi/renderer/fence_p.h
index 2581026d9..2581026d9 100644
--- a/src/plugins/renderers/rhi/renderer/glfence_p.h
+++ b/src/plugins/renderers/rhi/renderer/fence_p.h
diff --git a/src/plugins/renderers/rhi/renderer/openglvertexarrayobject.cpp b/src/plugins/renderers/rhi/renderer/openglvertexarrayobject.cpp
index ee0ef0386..7aea905fc 100644
--- a/src/plugins/renderers/rhi/renderer/openglvertexarrayobject.cpp
+++ b/src/plugins/renderers/rhi/renderer/openglvertexarrayobject.cpp
@@ -40,7 +40,7 @@
 #include "openglvertexarrayobject_p.h"
 #include <submissioncontext_p.h>
 #include <renderer_p.h>
-#include <glresourcemanagers_p.h>
+#include <resourcemanagers_p.h>
 #include <Qt3DRender/private/managers_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/renderers/rhi/renderer/rendercommand_p.h b/src/plugins/renderers/rhi/renderer/rendercommand_p.h
index d4ea13009..19dfb89c3 100644
--- a/src/plugins/renderers/rhi/renderer/rendercommand_p.h
+++ b/src/plugins/renderers/rhi/renderer/rendercommand_p.h
@@ -54,7 +54,7 @@
 
 #include <qglobal.h>
 #include <shaderparameterpack_p.h>
-#include <gl_handle_types_p.h>
+#include <handle_types_p.h>
 #include <renderviewjobutils_p.h>
 #include <Qt3DRender/private/handle_types_p.h>
 #include <Qt3DRender/qgeometryrenderer.h>
diff --git a/src/plugins/renderers/rhi/renderer/renderer.cpp b/src/plugins/renderers/rhi/renderer/renderer.cpp
index 2da5616b4..ffc304bb4 100644
--- a/src/plugins/renderers/rhi/renderer/renderer.cpp
+++ b/src/plugins/renderers/rhi/renderer/renderer.cpp
@@ -95,7 +95,7 @@
 #include <Qt3DRender/private/renderstateset_p.h>
 #include <Qt3DRender/private/setfence_p.h>
 
-#include <glbuffer_p.h>
+#include <buffer_p.h>
 #include <graphicscontext_p.h>
 #include <rendercommand_p.h>
 #include <renderqueue_p.h>
@@ -103,7 +103,7 @@
 #include <texture_p.h>
 #include <openglvertexarrayobject_p.h>
 #include <renderviewbuilder_p.h>
-#include <glresourcemanagers_p.h>
+#include <resourcemanagers_p.h>
 #include <commandexecuter_p.h>
 
 #include <QStack>
diff --git a/src/plugins/renderers/rhi/renderer/renderer.pri b/src/plugins/renderers/rhi/renderer/renderer.pri
index 0f68aa481..7716fd919 100644
--- a/src/plugins/renderers/rhi/renderer/renderer.pri
+++ b/src/plugins/renderers/rhi/renderer/renderer.pri
@@ -7,12 +7,13 @@ SOURCES += \
     $$PWD/renderqueue.cpp \
     $$PWD/renderview.cpp \
     $$PWD/renderviewbuilder.cpp \
+    $$PWD/shader.cpp \
     $$PWD/shaderparameterpack.cpp \
-    $$PWD/glshader.cpp \
     $$PWD/logging.cpp \
     $$PWD/commandexecuter.cpp
 
 HEADERS += \
+    $$PWD/fence_p.h \
     $$PWD/openglvertexarrayobject_p.h \
     $$PWD/renderercache_p.h \
     $$PWD/rendercommand_p.h \
@@ -20,9 +21,8 @@ HEADERS += \
     $$PWD/renderqueue_p.h \
     $$PWD/renderview_p.h \
     $$PWD/renderviewbuilder_p.h \
+    $$PWD/shader_p.h \
     $$PWD/shaderparameterpack_p.h \
     $$PWD/shadervariables_p.h \
-    $$PWD/glshader_p.h \
-    $$PWD/glfence_p.h \
     $$PWD/logging_p.h \
     $$PWD/commandexecuter_p.h
diff --git a/src/plugins/renderers/rhi/renderer/renderer_p.h b/src/plugins/renderers/rhi/renderer/renderer_p.h
index d697d7e3d..f4afeceb8 100644
--- a/src/plugins/renderers/rhi/renderer/renderer_p.h
+++ b/src/plugins/renderers/rhi/renderer/renderer_p.h
@@ -85,8 +85,8 @@
 #include <filtercompatibletechniquejob_p.h>
 #include <renderercache_p.h>
 #include <logging_p.h>
-#include <gl_handle_types_p.h>
-#include <glfence_p.h>
+#include <handle_types_p.h>
+#include <fence_p.h>
 #include <renderercache_p.h>
 
 #include <QHash>
diff --git a/src/plugins/renderers/rhi/renderer/renderview.cpp b/src/plugins/renderers/rhi/renderer/renderview.cpp
index aee84455b..45a0edbd5 100644
--- a/src/plugins/renderers/rhi/renderer/renderview.cpp
+++ b/src/plugins/renderers/rhi/renderer/renderview.cpp
@@ -71,7 +71,7 @@
 #include <renderer_p.h>
 #include <graphicscontext_p.h>
 #include <submissioncontext_p.h>
-#include <glresourcemanagers_p.h>
+#include <resourcemanagers_p.h>
 #include <Qt3DCore/qentity.h>
 #include <QtGui/qsurface.h>
 #include <algorithm>
diff --git a/src/plugins/renderers/rhi/renderer/glshader.cpp b/src/plugins/renderers/rhi/renderer/shader.cpp
index bed9a5bf5..992412dde 100644
--- a/src/plugins/renderers/rhi/renderer/glshader.cpp
+++ b/src/plugins/renderers/rhi/renderer/shader.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "glshader_p.h"
+#include "shader_p.h"
 #include <QMutexLocker>
 #include <Qt3DRender/private/stringtoint_p.h>
 #include <graphicscontext_p.h>
diff --git a/src/plugins/renderers/rhi/renderer/glshader_p.h b/src/plugins/renderers/rhi/renderer/shader_p.h
index 3520aaa2c..3520aaa2c 100644
--- a/src/plugins/renderers/rhi/renderer/glshader_p.h
+++ b/src/plugins/renderers/rhi/renderer/shader_p.h