Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laa413/lwjglTutorial
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: laa413/lwjglTutorial
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fromGLTexture
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 28 files changed
  • 2 contributors

Commits on Jul 13, 2017

  1. Starting to figure out openCL kernel with textrue

    Lindsey Abramson committed Jul 13, 2017
    Configuration menu
    Copy the full SHA
    f37b2f8 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2017

  1. Re-organized & commented code

    Lindsey Abramson committed Jul 14, 2017
    Configuration menu
    Copy the full SHA
    59c6938 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2017

  1. Refactored structure

    Lindsey Abramson committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    3593792 View commit details
    Browse the repository at this point in the history

  2. Trying to get data from image clmem

    Lindsey Abramson committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    18253f2 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2017

  1. trying demoFractal logic

    Lindsey Abramson committed Jul 20, 2017
    Configuration menu
    Copy the full SHA
    baa5d7b View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2017

  1. Refactored cl converting functions into main

    Lindsey Abramson committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    38ee76a View commit details
    Browse the repository at this point in the history

  2. More converting over

    Lindsey Abramson committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    0666239 View commit details
    Browse the repository at this point in the history

  3. Reading & printing texture image values WORKS

    Lindsey Abramson committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    771b56e View commit details
    Browse the repository at this point in the history

  4. TEXTURE APPEARS!

    Lindsey Abramson committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    ac09421 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1 from laa413/demoFractalTry 

    Working texture conversion
    @laa413
    laa413 authored Jul 21, 2017
    Configuration menu
    Copy the full SHA
    6e63b17 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2017

  1. attempting to write to an output image

    Lindsey Abramson committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    3e78900 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2017

  1. writing to texture working

    Lindsey Abramson committed Jul 25, 2017
    Configuration menu
    Copy the full SHA
    4383791 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from laa413/writeOutImg 

    Successfully wrote to & displayed a texture
    @laa413
    laa413 authored Jul 25, 2017
    Configuration menu
    Copy the full SHA
    99f55b8 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2017

  1. trying to convert logic to 3D

    Lindsey Abramson committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    912fed3 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2017

  1. read & write image kernel no error

    Lindsey Abramson committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    9fb8923 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2017

  1. trying to makde 3d texture work

    Lindsey Abramson committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    cd37bb7 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2017

  1. got 3d texture working

    Lindsey Abramson committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    3b66557 View commit details
    Browse the repository at this point in the history

  2. 3d Texture workign with simple edge detection

    Lindsey Abramson committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    c3495ea View commit details
    Browse the repository at this point in the history

  3. removing extra shape render from main

    Lindsey Abramson committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    0546382 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3 from laa413/3Dattempt 

    3D texture working
    @laa413
    laa413 authored Aug 2, 2017
    Configuration menu
    Copy the full SHA
    e462da1 View commit details
    Browse the repository at this point in the history
Loading