Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OpenGL 3.x update #3219

Merged
merged 36 commits into from
Nov 18, 2014
Merged

OpenGL 3.x update #3219

merged 36 commits into from
Nov 18, 2014

Commits on Oct 7, 2014

  1. Initial super-commit of port to OpenGL 3.3 - ported shaders, made sha… 

    …der version 150 from 120, refactored maths to calculate shader matrices slightly, fixed up call sites and main UI rendering issues.
    @fluffyfreak
    fluffyfreak committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    decc8cf View commit details
    Browse the repository at this point in the history

  2. Initialise these and use nullptr instead of 0

    @fluffyfreak
    fluffyfreak committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    5d8af0a View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2014

  1. Merge branch 'master' of https://github.com/pioneerspacesim/pioneer i… 

    …nto GL33
    @fluffyfreak
    fluffyfreak committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    9265069 View commit details
    Browse the repository at this point in the history

  2. Defunct comment since it does actually setup the VAO pointers directl… 

    …y above it.
    @fluffyfreak
    fluffyfreak committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    5ebcc91 View commit details
    Browse the repository at this point in the history

  3. New UI and VtxColor materials and shaders. 

    Don't bother to cleanup the shader programs on destroying the renderer they'll be released automatically.
    @fluffyfreak
    fluffyfreak committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    aaa9c5d View commit details
    Browse the repository at this point in the history

  4. Request a compatibility profile and enable the GL_EXT_texture_compres… 

    …sion_s3tc test again
    @fluffyfreak
    fluffyfreak committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    72d1118 View commit details
    Browse the repository at this point in the history

  5. Output more logging during loading and CityOnPlanet initialisation.

    @fluffyfreak
    fluffyfreak committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    bcbbb76 View commit details
    Browse the repository at this point in the history

  6. Renaming and moving of files.

    @fluffyfreak
    fluffyfreak committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    3d8a898 View commit details
    Browse the repository at this point in the history

  7. rename the gl2 folder to opengl

    @fluffyfreak
    fluffyfreak committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    843bd14 View commit details
    Browse the repository at this point in the history

  8. Renamed shaders folder from gl2 to opengl

    @fluffyfreak
    fluffyfreak committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    b9589ae View commit details
    Browse the repository at this point in the history

  9. Update all of the graphics files with the new locations and naming sc… 

    …hemes.
    @fluffyfreak
    fluffyfreak committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    e659bc4 View commit details
    Browse the repository at this point in the history

  10. Prevent shadowing of the "lights" member by the constructor parameter

    @fluffyfreak
    fluffyfreak committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    685412e View commit details
    Browse the repository at this point in the history

  11. CheckRenderErrors was undeclared within the TextureGL scope after I'd… 

    … moved it.
    @fluffyfreak
    fluffyfreak committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    bddf494 View commit details
    Browse the repository at this point in the history

  12. Fixed makefile

    @fluffyfreak
    fluffyfreak committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    a5f1cb6 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2014

  1. Comment out the glewExperimental flag

    @fluffyfreak
    fluffyfreak committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    af4aa81 View commit details
    Browse the repository at this point in the history

  2. Bump the GLSL version number to 330

    @fluffyfreak
    fluffyfreak committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    af00ed8 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2014

  1. Mac and Linux seem to require both glewExperimental and cannot handle… 

    … 3.3 reliably, gone back to GLSL 150, OpenGL 3.2 etc
    @fluffyfreak
    fluffyfreak committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    ee9a3e7 View commit details
    Browse the repository at this point in the history

  2. Get running on Mac

    @fluffyfreak
    fluffyfreak committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    9cd9b81 View commit details
    Browse the repository at this point in the history

  3. Note why we're having to force the CORE OpenGL profile. 

    Disable the GL_EXT_texture_compression_s3tc everywhere.
    @fluffyfreak
    fluffyfreak committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    66bd287 View commit details
    Browse the repository at this point in the history

  4. Extend the texture compression detection tests.

    @fluffyfreak
    fluffyfreak committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    7ab46f2 View commit details
    Browse the repository at this point in the history

  5. RendererGL2 renamed to RendererOGL

    @fluffyfreak
    fluffyfreak committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    a9d3de0 View commit details
    Browse the repository at this point in the history

  6. No more glLineWidth post OpenGL 3.x

    @fluffyfreak
    fluffyfreak committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    54b1ec4 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2014

  1. Actually restore the viewport after popping the state.

    @fluffyfreak
    fluffyfreak committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    1bfb24b View commit details
    Browse the repository at this point in the history

  2. Remove duplicate Material / MaerialParameters. 

    Fix planetrings shaders for modern GLSL.
    @fluffyfreak
    fluffyfreak committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    6e37b5e View commit details
    Browse the repository at this point in the history

  3. Update the shader code dumping.

    @fluffyfreak
    fluffyfreak committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    740bb04 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/pioneerspacesim/pioneer i… 

    …nto GL33
    @fluffyfreak
    fluffyfreak committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    040c750 View commit details
    Browse the repository at this point in the history

  5. Extend to vec4 by zero fixes FresnelColour hypersphere rendering

    @fluffyfreak
    fluffyfreak committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    252c347 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2014

  1. Allow for geometry shader type to be used.

    @fluffyfreak
    fluffyfreak committed Oct 18, 2014
    Configuration menu
    Copy the full SHA
    c54b5e3 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2014

  1. Update include guards to use _OGL_ instead of _GL2_

    @fluffyfreak
    fluffyfreak committed Oct 19, 2014
    Configuration menu
    Copy the full SHA
    601c120 View commit details
    Browse the repository at this point in the history

  2. Fixed the line ending problems with exported shader listings

    @fluffyfreak
    fluffyfreak committed Oct 19, 2014
    Configuration menu
    Copy the full SHA
    0a823b7 View commit details
    Browse the repository at this point in the history

  3. Future line Material shader

    @fluffyfreak
    fluffyfreak committed Oct 19, 2014
    Configuration menu
    Copy the full SHA
    a5d5769 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2014

  1. Merge branch 'master' of https://github.com/pioneerspacesim/pioneer i… 

    …nto GL33
    @fluffyfreak
    fluffyfreak committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    3470065 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2014

  1. These asserts are not valid. You can happily change the buffer withou… 

    …t first releasing it.
    @fluffyfreak
    fluffyfreak committed Nov 15, 2014
    Configuration menu
    Copy the full SHA
    3ec7f92 View commit details
    Browse the repository at this point in the history

  2. Not valid for OpenGL 3.X

    @fluffyfreak
    fluffyfreak committed Nov 15, 2014
    Configuration menu
    Copy the full SHA
    ed7f18c View commit details
    Browse the repository at this point in the history

  3. Flush the last of the errors - hopefully they're all invalid!

    @fluffyfreak
    fluffyfreak committed Nov 15, 2014
    Configuration menu
    Copy the full SHA
    c0f20dc View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/pioneerspacesim/pioneer i… 

    …nto GL33
    @fluffyfreak
    fluffyfreak committed Nov 15, 2014
    Configuration menu
    Copy the full SHA
    53680cc View commit details
    Browse the repository at this point in the history