diff options
| author | Sven Gothel <[email protected]> | 2013-04-27 08:28:46 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-04-27 08:28:46 +0200 |
| commit | 587ec1437ed762ed8cdfcbf27f940ab83813f4a5 (patch) | |
| tree | 2d08276103378af8f93fea3d2a3a7cce593cd15a /src/test/com/jogamp/opengl | |
| parent | 2fc95fa183a133b4a1b675c50a2d97bf41c6c391 (diff) | |
TextureData: Add PixelAttributes and PixelBufferProvider; ColorSink back to JPEGDecode (not general enough)
- TextureData: Add PixelAttributes and PixelBufferProvider
- PixelBufferProvider is intended as a pattern allowing
producers (i.e. GLReadBufferUtil) to utilize custom pixel buffer
for various intend.
- PixelAttributes can be chosen by PixelBufferProvider implementation
and groups the texture's pixel/data format and type.
TextureData uses PixelAttributes internally now.
- ColorSink back to JPEGDecode (not general enough)
- Partially reverts 94ea306d1809290db678d3181619bdc39d4334bb
Diffstat (limited to 'src/test/com/jogamp/opengl')
3 files changed, 4 insertions, 8 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java index 37054afe6..71a63a701 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java @@ -49,8 +49,7 @@ public class TestJPEGImage01NEWT extends UITestCase { image.getWidth(), image.getHeight(), 0, - image.getGLFormat(), - image.getGLType(), + new TextureData.PixelAttributes(image.getGLFormat(), image.getGLType()), false /* mipmap */, false /* compressed */, false /* must flip-vert */, diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTBenchmarkNewtAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTBenchmarkNewtAWT.java index de8a4e2b5..681667362 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTBenchmarkNewtAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTBenchmarkNewtAWT.java @@ -68,8 +68,7 @@ public class TestJPEGJoglAWTBenchmarkNewtAWT extends UITestCase { image.getWidth(), image.getHeight(), 0, - image.getGLFormat(), - image.getGLType(), + new TextureData.PixelAttributes(image.getGLFormat(), image.getGLType()), false /* mipmap */, false /* compressed */, false /* must flip-vert */, @@ -97,8 +96,7 @@ public class TestJPEGJoglAWTBenchmarkNewtAWT extends UITestCase { image.getWidth(), image.getHeight(), 0, - image.getGLFormat(), - image.getGLType(), + new TextureData.PixelAttributes(image.getGLFormat(), image.getGLType()), false /* mipmap */, false /* compressed */, false /* must flip-vert */, diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTCompareNewtAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTCompareNewtAWT.java index c85aa55b8..5d2969815 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTCompareNewtAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTCompareNewtAWT.java @@ -112,8 +112,7 @@ public class TestJPEGJoglAWTCompareNewtAWT extends UITestCase { image.getWidth(), image.getHeight(), 0, - image.getGLFormat(), - image.getGLType(), + new TextureData.PixelAttributes(image.getGLFormat(), image.getGLType()), false /* mipmap */, false /* compressed */, false /* must flip-vert */, |