mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-25 02:04:23 +00:00
Code Activity

Minor win32 GL fix.

Browse source
This commit is contained in:
jules 2011-12-19 20:32:28 +00:00
parent 0d1c72f0b1
commit 115d86817f
2 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/juce_opengl/native/juce_OpenGLExtensions.h
View file

@ -115,6 +115,7 @@ enum
typedef char GLchar;
typedef long GLsizeiptr;
typedef long GLintptr;
#define WGL_FUNCTION_LIST(USE_FUNCTION) \
USE_FUNCTION (wglChoosePixelFormatARB, BOOL, (HDC, const int*, const FLOAT*, UINT, int*, UINT*))\

34
modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
View file

@ -958,6 +958,26 @@ struct StateHelpers
setActiveTexture (0);
}
template <class QuadQueueType>
void setTwoTextureMode (QuadQueueType& quadQueue, GLuint texture1, GLuint texture2)
{
setTexturesEnabled (quadQueue, 3);
if (currentActiveTexture == 0)
{
bindTexture (texture1);
setActiveTexture (1);
bindTexture (texture2);
}
else
{
setActiveTexture (1);
bindTexture (texture2);
setActiveTexture (0);
bindTexture (texture1);
}
}
void setActiveTexture (const int index) noexcept
{
if (currentActiveTexture != index)
@ -1071,12 +1091,12 @@ struct StateHelpers
: numVertices (0)
{}
~ShaderQuadQueue()
~ShaderQuadQueue() noexcept
{
glDeleteBuffers (2, buffers);
}
void initialise()
void initialise() noexcept
{
for (int i = 0, v = 0; i < numQuads * 6; i += 6, v += 4)
{
@ -1125,13 +1145,13 @@ struct StateHelpers
RenderingHelpers::FloatRectangleRasterisingInfo (r).iterate (frr);
}
void add (const RectangleList& list, const PixelARGB& colour)
void add (const RectangleList& list, const PixelARGB& colour) noexcept
{
for (RectangleList::Iterator i (list); i.next();)
add (*i.getRectangle(), colour);
}
void add (const RectangleList& list, const Rectangle<int>& clip, const PixelARGB& colour)
void add (const RectangleList& list, const Rectangle<int>& clip, const PixelARGB& colour) noexcept
{
for (RectangleList::Iterator i (list); i.next();)
{
@ -1697,11 +1717,7 @@ public:
if (maskArea != nullptr)
{
activeTextures.setTexturesEnabled (shaderQuadQueue, 3);
activeTextures.setActiveTexture (1);
activeTextures.bindTexture (maskTextureID);
activeTextures.setActiveTexture (0);
activeTextures.bindTexture (image.textureID);
activeTextures.setTwoTextureMode (shaderQuadQueue, image.textureID, maskTextureID);
if (clampTiledImages)
{