Changeset 1523


Ignore:
Timestamp:
Jun 24, 2012, 9:10:14 PM (8 years ago)
Author:
sam
Message:

build: OS X compilation fixes: use GL_INVALID_ENUM instead of GL_INVALID_INDEX
and support automake 1.12 in the bootstrap script.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/bootstrap

    r1036 r1523  
    4747# Check for automake
    4848amvers="no"
    49 for v in 11 10 9 8 7 6 5; do
     49for v in 12 11 10 9 8 7 6 5; do
    5050  if automake-1.${v} --version >/dev/null 2>&1; then
    5151    amvers="-1.${v}"
  • trunk/src/gpu/framebuffer.cpp

    r1517 r1523  
    8383    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
    8484                           GL_TEXTURE_2D, m_data->m_texture, 0);
    85     m_data->m_depth = GL_INVALID_INDEX;
    86     if (depth != GL_INVALID_INDEX)
     85    m_data->m_depth = GL_INVALID_ENUM;
     86    if (depth != GL_INVALID_ENUM)
    8787    {
    8888        glGenRenderbuffers(1, &m_data->m_depth);
     
    107107    glDeleteFramebuffers(1, &m_data->m_fbo);
    108108    glDeleteTextures(1, &m_data->m_texture);
    109     if (m_data->m_depth != GL_INVALID_INDEX)
     109    if (m_data->m_depth != GL_INVALID_ENUM)
    110110        glDeleteRenderbuffers(1, &m_data->m_depth);
    111111#else
Note: See TracChangeset for help on using the changeset viewer.