mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash with ABufferFixed implementation

Browse Source
This commit is contained in:
Alexander Bock
2015-05-19 01:05:19 +02:00
parent 02dbe8c2b3
commit dc665639d5
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/openspace/rendering/planets/renderableplanetprojection.h
View File

@@ -24,6 +24,7 @@
#ifndef __RENDERABLEPLANETPROJECTION_H__
#define __RENDERABLEPLANETPROJECTION_H__
#include <ghoul/opengl/textureunit.h>
// open space includes

4
shaders/ABuffer/abufferSort.hglsl
View File

@@ -57,9 +57,9 @@ int build_local_fragments_list() {
return int(frag_count);
#endif
#if ABUFFER_IMPLEMENTATION == ABUFFER_FRAMEBUFFER
// #if ABUFFER_IMPLEMENTATION == ABUFFER_FRAMEBUFFER
return 0;
#endif
// #endif
}
float pscLength(vec4 v1, vec4 v2) {

3
src/abuffer/abufferfixed.cpp
View File

@@ -45,9 +45,6 @@ ABufferFixed::ABufferFixed(): _data(0), _anchorPointerTexture(0),
{}
ABufferFixed::~ABufferFixed() {
if(_data != 0)
delete _data;
glDeleteTextures(1,&_anchorPointerTexture);
glDeleteTextures(1,&_fragmentTexture);
// glDeleteTextures(1,&_atomicCounterTexture);

2
src/rendering/renderableplane.cpp
View File

@@ -183,9 +183,7 @@ void RenderablePlane::update(const UpdateData& data) {
}
void RenderablePlane::loadTexture() {
LDEBUG("loadTexture");
if (_texturePath.value() != "") {
LDEBUG("loadTexture2");
ghoul::opengl::Texture* texture = ghoul::io::TextureReader::ref().loadTexture(absPath(_texturePath));
if (texture) {
LDEBUG("Loaded texture from '" << absPath(_texturePath) << "'");