Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // This file is here so other GLES2 related files can have a common set of | 5 // This file is here so other GLES2 related files can have a common set of |
| 6 // includes where appropriate. | 6 // includes where appropriate. |
| 7 | 7 |
| 8 #include "gpu/command_buffer/common/gles2_cmd_utils.h" | 8 #include "gpu/command_buffer/common/gles2_cmd_utils.h" |
| 9 | 9 |
| 10 #include <GLES2/gl2.h> | 10 #include <GLES2/gl2.h> |
| (...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1084 return GL_SHORT; | 1084 return GL_SHORT; |
| 1085 case GL_R32I: | 1085 case GL_R32I: |
| 1086 case GL_RG32I: | 1086 case GL_RG32I: |
| 1087 case GL_RGBA32I: | 1087 case GL_RGBA32I: |
| 1088 return GL_INT; | 1088 return GL_INT; |
| 1089 case GL_R32F: | 1089 case GL_R32F: |
| 1090 case GL_RG32F: | 1090 case GL_RG32F: |
| 1091 case GL_RGB32F: | 1091 case GL_RGB32F: |
| 1092 case GL_RGBA32F: | 1092 case GL_RGBA32F: |
| 1093 case GL_R11F_G11F_B10F: | 1093 case GL_R11F_G11F_B10F: |
| 1094 return GL_UNSIGNED_BYTE; | 1094 return GL_FLOAT; |
|
Ken Russell (switch to Gerrit)
2016/09/30 23:01:29
I think this change is actually wrong. For these f
aleksandar.stojiljkovic
2016/10/03 10:56:52
Done. Wasn't important. GL_IMPLEMENTATION_COLOR_RE
| |
| 1095 case GL_R16F: | 1095 case GL_R16F: |
| 1096 case GL_RG16F: | 1096 case GL_RG16F: |
| 1097 case GL_RGB16F: | 1097 case GL_RGB16F: |
| 1098 case GL_RGBA16F: | 1098 case GL_RGBA16F: |
| 1099 return GL_HALF_FLOAT; | 1099 return GL_HALF_FLOAT; |
| 1100 default: | 1100 default: |
| 1101 // Unsized internal format. | 1101 // Unsized internal format. |
| 1102 return texture_type; | 1102 return texture_type; |
| 1103 } | 1103 } |
| 1104 } | 1104 } |
| (...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1876 } | 1876 } |
| 1877 | 1877 |
| 1878 return true; | 1878 return true; |
| 1879 } | 1879 } |
| 1880 | 1880 |
| 1881 #include "gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h" | 1881 #include "gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h" |
| 1882 | 1882 |
| 1883 } // namespace gles2 | 1883 } // namespace gles2 |
| 1884 } // namespace gpu | 1884 } // namespace gpu |
| 1885 | 1885 |
| OLD | NEW |