git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.ucc.asn.au:ipdf/code
[ipdf/code.git]
/
src
/
graphicsbuffer.cpp
diff --git
a/src/graphicsbuffer.cpp
b/src/graphicsbuffer.cpp
index
217fa9a
..
844dfe8
100644
(file)
--- a/
src/graphicsbuffer.cpp
+++ b/
src/graphicsbuffer.cpp
@@
-224,7
+224,7
@@
void GraphicsBuffer::Upload(size_t length, const void* data)
if (!RecreateBuffer(data))
{
Bind();
if (!RecreateBuffer(data))
{
Bind();
- glBufferData(target, length, data, usage);
+ glBufferData(target, length
+1
, data, usage);
}
if (data != NULL)
m_invalidated = false;
}
if (data != NULL)
m_invalidated = false;
@@
-243,7
+243,7
@@
void GraphicsBuffer::UploadRange(size_t length, intptr_t offset, const void* dat
void GraphicsBuffer::Resize(size_t length)
{
void GraphicsBuffer::Resize(size_t length)
{
- if (m_invalidated)
+ if (m_invalidated
&& m_buffer_size >= length
)
{
m_buffer_size = length;
}
{
m_buffer_size = length;
}
UCC
git Repository :: git.ucc.asn.au