Commit 61a2ae68 authored by Robert Menzel's avatar Robert Menzel

DDX bug, wrong object label string fixed

parent 49f94bab
......@@ -33,6 +33,7 @@ public:
// GL_TRANSFORM_FEEDBACK, GL_SAMPLER, GL_TEXTURE, GL_RENDERBUFFER or GL_FRAMEBUFFER
template <unsigned int THE_GL_TYPE>
void setObjectLabelT( GLuint _objectName, const std::string &_label ) {
//ACGL::Utils::debug() << "label " << _objectName << " as " << _label << std::endl;
glObjectLabel( THE_GL_TYPE, _objectName, -1, _label.c_str() );
}
......
......@@ -70,7 +70,7 @@ bool Shader::setFromFile(SharedShaderParser const& _sp)
}
}
setObjectLabel( _sp->getSources()[0].c_str() );
setObjectLabel( _sp->getFileName(0).c_str() );
return !compileErrors; // return true iff there were no errors
}
......
......@@ -1058,7 +1058,7 @@ void CDDSImage::flip_dxt5_alpha(DXT5AlphaBlock *block)
uint8_t gBits[4][4];
const uint32_t mask = 0x00000007; // bits = 00 00 01 11
uint16_t bits = 0;
uint32_t bits = 0;
memcpy(&bits, &block->row[0], sizeof(uint8_t) * 3);
gBits[0][0] = (uint8_t)(bits & mask);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment