commit 005979d733af90070cb09819a5ce0c5aa3fc974e
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 21:11:29 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 21:11:29 2012 +0000
tree f7af50b4f82d3032722d5acc23a53874d16a95c5
parent 8ca7d3758cd40d0cf0b388e06425fc8dabe0c8bc

Adds new functions to support load*Data for DX11-supported formats

TRAC #22294

Author: Shannon Woods
Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1617 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/renderer/Image.h

diff --git a/src/libGLESv2/renderer/Image.h b/src/libGLESv2/renderer/Image.h
index ad114f3..454e83e 100644
--- a/src/libGLESv2/renderer/Image.h
+++ b/src/libGLESv2/renderer/Image.h
@@ -57,6 +57,8 @@
 
     static void loadAlphaDataToBGRA(GLsizei width, GLsizei height,
                                     int inputPitch, const void *input, size_t outputPitch, void *output);
+    static void loadAlphaDataToNative(GLsizei width, GLsizei height,
+                                      int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadAlphaDataToBGRASSE2(GLsizei width, GLsizei height,
                                         int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadAlphaFloatDataToRGBA(GLsizei width, GLsizei height,
@@ -67,6 +69,8 @@
                                         int inputPitch, const void *input, size_t outputPitch, void *output, bool native);
     static void loadLuminanceFloatDataToRGBA(GLsizei width, GLsizei height,
                                              int inputPitch, const void *input, size_t outputPitch, void *output);
+    static void loadLuminanceFloatDataToRGB(GLsizei width, GLsizei height,
+                                            int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadLuminanceHalfFloatDataToRGBA(GLsizei width, GLsizei height,
                                                  int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadLuminanceAlphaDataToNativeOrBGRA(GLsizei width, GLsizei height,
@@ -77,20 +81,32 @@
                                                       int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadRGBUByteDataToBGRX(GLsizei width, GLsizei height,
                                        int inputPitch, const void *input, size_t outputPitch, void *output);
+    static void loadRGBUByteDataToRGBA(GLsizei width, GLsizei height,
+                                       int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadRGB565DataToBGRA(GLsizei width, GLsizei height,
                                      int inputPitch, const void *input, size_t outputPitch, void *output);
+    static void loadRGB565DataToRGBA(GLsizei width, GLsizei height,
+                                     int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadRGBFloatDataToRGBA(GLsizei width, GLsizei height,
                                        int inputPitch, const void *input, size_t outputPitch, void *output);
+    static void loadRGBFloatDataToNative(GLsizei width, GLsizei height,
+                                         int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadRGBHalfFloatDataToRGBA(GLsizei width, GLsizei height,
                                            int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadRGBAUByteDataToBGRASSE2(GLsizei width, GLsizei height,
                                             int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadRGBAUByteDataToBGRA(GLsizei width, GLsizei height,
                                         int inputPitch, const void *input, size_t outputPitch, void *output);
+    static void loadRGBAUByteDataToNative(GLsizei width, GLsizei height,
+                                          int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadRGBA4444DataToBGRA(GLsizei width, GLsizei height,
                                        int inputPitch, const void *input, size_t outputPitch, void *output);
+    static void loadRGBA4444DataToRGBA(GLsizei width, GLsizei height,
+                                       int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadRGBA5551DataToBGRA(GLsizei width, GLsizei height,
                                        int inputPitch, const void *input, size_t outputPitch, void *output);
+    static void loadRGBA5551DataToRGBA(GLsizei width, GLsizei height,
+                                       int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadRGBAFloatDataToRGBA(GLsizei width, GLsizei height,
                                         int inputPitch, const void *input, size_t outputPitch, void *output);
     static void loadRGBAHalfFloatDataToRGBA(GLsizei width, GLsizei height,