| 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 #include "gpu/command_buffer/service/texture_manager.h" |     5 #include "gpu/command_buffer/service/texture_manager.h" | 
|     6  |     6  | 
|     7 #include <stddef.h> |     7 #include <stddef.h> | 
|     8 #include <stdint.h> |     8 #include <stdint.h> | 
|     9  |     9  | 
|    10 #include <algorithm> |    10 #include <algorithm> | 
| (...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1346         return GL_INVALID_ENUM; |  1346         return GL_INVALID_ENUM; | 
|  1347       } |  1347       } | 
|  1348       swizzle_b_ = param; |  1348       swizzle_b_ = param; | 
|  1349       break; |  1349       break; | 
|  1350     case GL_TEXTURE_SWIZZLE_A: |  1350     case GL_TEXTURE_SWIZZLE_A: | 
|  1351       if (!feature_info->validators()->texture_swizzle.IsValid(param)) { |  1351       if (!feature_info->validators()->texture_swizzle.IsValid(param)) { | 
|  1352         return GL_INVALID_ENUM; |  1352         return GL_INVALID_ENUM; | 
|  1353       } |  1353       } | 
|  1354       swizzle_a_ = param; |  1354       swizzle_a_ = param; | 
|  1355       break; |  1355       break; | 
|  1356     case GL_TEXTURE_SRGB_DECODE_EXT: |  | 
|  1357       if (!feature_info->validators()->texture_srgb_decode_ext.IsValid(param)) { |  | 
|  1358         return GL_INVALID_ENUM; |  | 
|  1359       } |  | 
|  1360       break; |  | 
|  1361     case GL_TEXTURE_IMMUTABLE_FORMAT: |  1356     case GL_TEXTURE_IMMUTABLE_FORMAT: | 
|  1362     case GL_TEXTURE_IMMUTABLE_LEVELS: |  1357     case GL_TEXTURE_IMMUTABLE_LEVELS: | 
|  1363       return GL_INVALID_ENUM; |  1358       return GL_INVALID_ENUM; | 
|  1364     default: |  1359     default: | 
|  1365       NOTREACHED(); |  1360       NOTREACHED(); | 
|  1366       return GL_INVALID_ENUM; |  1361       return GL_INVALID_ENUM; | 
|  1367   } |  1362   } | 
|  1368   Update(); |  1363   Update(); | 
|  1369   UpdateCleared(); |  1364   UpdateCleared(); | 
|  1370   UpdateCanRenderCondition(); |  1365   UpdateCanRenderCondition(); | 
| (...skipping 2285 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  3656 uint32_t TextureManager::GetServiceIdGeneration() const { |  3651 uint32_t TextureManager::GetServiceIdGeneration() const { | 
|  3657   return current_service_id_generation_; |  3652   return current_service_id_generation_; | 
|  3658 } |  3653 } | 
|  3659  |  3654  | 
|  3660 void TextureManager::IncrementServiceIdGeneration() { |  3655 void TextureManager::IncrementServiceIdGeneration() { | 
|  3661   current_service_id_generation_++; |  3656   current_service_id_generation_++; | 
|  3662 } |  3657 } | 
|  3663  |  3658  | 
|  3664 }  // namespace gles2 |  3659 }  // namespace gles2 | 
|  3665 }  // namespace gpu |  3660 }  // namespace gpu | 
| OLD | NEW |