Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Side by Side Diff: gpu/command_buffer/common/gles2_cmd_utils.h

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_H_ 8 #ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_H_
9 #define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_H_ 9 #define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_H_
10 10
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 // it's an invalid uniform name. 180 // it's an invalid uniform name.
181 static bool ParseUniformName( 181 static bool ParseUniformName(
182 const std::string& name, 182 const std::string& name,
183 size_t* array_pos, 183 size_t* array_pos,
184 int* element_index, 184 int* element_index,
185 bool* getting_array); 185 bool* getting_array);
186 186
187 static size_t CalcClearBufferivDataCount(int buffer); 187 static size_t CalcClearBufferivDataCount(int buffer);
188 static size_t CalcClearBufferfvDataCount(int buffer); 188 static size_t CalcClearBufferfvDataCount(int buffer);
189 189
190 static void MapUint64ToTwoUint32(
191 uint64_t v64, uint32_t* v32_0, uint32_t* v32_1);
192 static uint64_t MapTwoUint32ToUint64(uint32_t v32_0, uint32_t v32_1);
193
194 #include "../common/gles2_cmd_utils_autogen.h" 190 #include "../common/gles2_cmd_utils_autogen.h"
195 191
196 private: 192 private:
197 static std::string GetQualifiedEnumString( 193 static std::string GetQualifiedEnumString(
198 const EnumToString* table, size_t count, uint32_t value); 194 const EnumToString* table, size_t count, uint32_t value);
199 195
200 static const EnumToString* const enum_to_string_table_; 196 static const EnumToString* const enum_to_string_table_;
201 static const size_t enum_to_string_table_len_; 197 static const size_t enum_to_string_table_len_;
202 198
203 int num_compressed_texture_formats_; 199 int num_compressed_texture_formats_;
(...skipping 19 matching lines...) Expand all
223 bool bind_generates_resource; 219 bool bind_generates_resource;
224 bool fail_if_major_perf_caveat; 220 bool fail_if_major_perf_caveat;
225 bool lose_context_when_out_of_memory; 221 bool lose_context_when_out_of_memory;
226 }; 222 };
227 223
228 } // namespace gles2 224 } // namespace gles2
229 } // namespace gpu 225 } // namespace gpu
230 226
231 #endif // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_H_ 227 #endif // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_H_
232 228
OLDNEW
« no previous file with comments | « gpu/command_buffer/common/gles2_cmd_ids_autogen.h ('k') | gpu/command_buffer/common/gles2_cmd_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698