Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
90c7c72d
Commit
90c7c72d
authored
Nov 13, 2014
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reverted missing changes.
parent
7de3aa9a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
12 deletions
+2
-12
opengl_compositor.cpp
common/gal/opengl/opengl_compositor.cpp
+2
-12
No files found.
common/gal/opengl/opengl_compositor.cpp
View file @
90c7c72d
...
@@ -91,12 +91,10 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer()
...
@@ -91,12 +91,10 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer()
{
{
wxASSERT
(
m_initialized
);
wxASSERT
(
m_initialized
);
unsigned
int
maxBuffers
,
maxWidth
,
maxHeight
;
unsigned
int
maxBuffers
;
// Get the maximum
size &
number of buffers
// Get the maximum number of buffers
glGetIntegerv
(
GL_MAX_COLOR_ATTACHMENTS
,
(
GLint
*
)
&
maxBuffers
);
glGetIntegerv
(
GL_MAX_COLOR_ATTACHMENTS
,
(
GLint
*
)
&
maxBuffers
);
glGetIntegerv
(
GL_MAX_FRAMEBUFFER_WIDTH
,
(
GLint
*
)
&
maxWidth
);
glGetIntegerv
(
GL_MAX_FRAMEBUFFER_HEIGHT
,
(
GLint
*
)
&
maxHeight
);
if
(
usedBuffers
()
>=
maxBuffers
)
if
(
usedBuffers
()
>=
maxBuffers
)
{
{
...
@@ -106,14 +104,6 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer()
...
@@ -106,14 +104,6 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer()
return
0
;
// Unfortunately we have no more free buffers left
return
0
;
// Unfortunately we have no more free buffers left
}
}
if
(
m_width
>
maxWidth
||
m_height
>
maxHeight
)
{
DisplayError
(
NULL
,
wxString
::
Format
(
wxT
(
"Max handled framebuffer size is %d x %d,"
" but %x x %x is required."
),
maxWidth
,
maxHeight
,
m_width
,
m_height
)
);
return
0
;
}
// GL_COLOR_ATTACHMENTn are consecutive integers
// GL_COLOR_ATTACHMENTn are consecutive integers
GLuint
attachmentPoint
=
GL_COLOR_ATTACHMENT0
+
usedBuffers
();
GLuint
attachmentPoint
=
GL_COLOR_ATTACHMENT0
+
usedBuffers
();
GLuint
textureTarget
;
GLuint
textureTarget
;
...
...
Write
Preview
Markdown
is supported
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