Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ACGL
acgl
Commits
61a2ae68
Commit
61a2ae68
authored
Nov 01, 2015
by
Robert Menzel
Browse files
DDX bug, wrong object label string fixed
parent
49f94bab
Changes
3
Hide whitespace changes
Inline
Side-by-side
include/ACGL/OpenGL/Debug.hh
View file @
61a2ae68
...
...
@@ -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
()
);
}
...
...
src/ACGL/OpenGL/Objects/Shader.cc
View file @
61a2ae68
...
...
@@ -70,7 +70,7 @@ bool Shader::setFromFile(SharedShaderParser const& _sp)
}
}
setObjectLabel
(
_sp
->
get
Sources
()[
0
]
.
c_str
()
);
setObjectLabel
(
_sp
->
get
FileName
(
0
)
.
c_str
()
);
return
!
compileErrors
;
// return true iff there were no errors
}
...
...
src/nv_dds/nv_dds.cpp
View file @
61a2ae68
...
...
@@ -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
uint
16
_t
bits
=
0
;
uint
32
_t
bits
=
0
;
memcpy
(
&
bits
,
&
block
->
row
[
0
],
sizeof
(
uint8_t
)
*
3
);
gBits
[
0
][
0
]
=
(
uint8_t
)(
bits
&
mask
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment