Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 03:40:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try to make the inlucde sequence simpler in gpu for GLBackend

Browse source
This commit is contained in:
Sam Gateau 2015-07-29 16:48:23 -07:00
parent 5baf993c24
commit 4972cb024f
4 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/gpu/src/gpu/Batch.cpp
View file

@ -10,12 +10,6 @@
// //
#include "Batch.h" #include "Batch.h"
#include <GLMHelpers.h>
#include <QDebug>
#include "GPUConfig.h"
#if defined(NSIGHT_FOUND) #if defined(NSIGHT_FOUND)
#include "nvToolsExt.h" #include "nvToolsExt.h"
@ -288,15 +282,3 @@ void Batch::getQuery(const QueryPointer& query) {
_params.push_back(_queries.cache(query)); _params.push_back(_queries.cache(query));
} }
void push_back(Batch::Params& params, const vec3& v) {
params.push_back(v.x);
params.push_back(v.y);
params.push_back(v.z);
}
void push_back(Batch::Params& params, const vec4& v) {
params.push_back(v.x);
params.push_back(v.y);
params.push_back(v.z);
params.push_back(v.a);
}

1
libraries/gpu/src/gpu/GLBackend.cpp
View file

@ -11,7 +11,6 @@
#include "GLBackendShared.h" #include "GLBackendShared.h"
#include <mutex> #include <mutex>
#include "GPULogging.h"
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
using namespace gpu; using namespace gpu;

2
libraries/gpu/src/gpu/GLBackend.h
View file

@ -18,8 +18,6 @@
#include "GPUConfig.h" #include "GPUConfig.h"
#include "Context.h" #include "Context.h"
#include "Batch.h"
namespace gpu { namespace gpu {

2
libraries/gpu/src/gpu/GLBackendShared.h
View file

@ -16,8 +16,6 @@
#include "GPULogging.h" #include "GPULogging.h"
#include "GLBackend.h" #include "GLBackend.h"
#include "Batch.h"
static const GLenum _primitiveToGLmode[gpu::NUM_PRIMITIVES] = { static const GLenum _primitiveToGLmode[gpu::NUM_PRIMITIVES] = {
GL_POINTS, GL_POINTS,
GL_LINES, GL_LINES,