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

Side by Side Diff: skia/config/SkUserConfig.h

Issue 1508903002: Use GrGLTextureInfo for Skia texture handles. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ignore_gl_target
Patch Set: fix comment on #endif in new file Created 4 years, 9 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 /* 1 /*
2 * Copyright (C) 2006 The Android Open Source Project 2 * Copyright (C) 2006 The Android Open Source Project
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at 6 * You may obtain a copy of the License at
7 * 7 *
8 * http://www.apache.org/licenses/LICENSE-2.0 8 * http://www.apache.org/licenses/LICENSE-2.0
9 * 9 *
10 * Unless required by applicable law or agreed to in writing, software 10 * Unless required by applicable law or agreed to in writing, software
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 243
244 /* In some places Skia can use static initializers for global initialization, 244 /* In some places Skia can use static initializers for global initialization,
245 * or fall back to lazy runtime initialization. Chrome always wants the latter. 245 * or fall back to lazy runtime initialization. Chrome always wants the latter.
246 */ 246 */
247 #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0 247 #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0
248 248
249 /* This flag forces Skia not to use typographic metrics with GDI. 249 /* This flag forces Skia not to use typographic metrics with GDI.
250 */ 250 */
251 #define SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS 251 #define SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS
252 252
253 #ifndef SK_IGNORE_GL_TEXTURE_TARGET
254 # define SK_IGNORE_GL_TEXTURE_TARGET
255 #endif
256 #define SK_IGNORE_BLURRED_RRECT_OPT 253 #define SK_IGNORE_BLURRED_RRECT_OPT
257 #define SK_USE_DISCARDABLE_SCALEDIMAGECACHE 254 #define SK_USE_DISCARDABLE_SCALEDIMAGECACHE
258 #define SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT 255 #define SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT
259 256
260 #define SK_ATTR_DEPRECATED SK_NOTHING_ARG1 257 #define SK_ATTR_DEPRECATED SK_NOTHING_ARG1
261 #define SK_ENABLE_INST_COUNT 0 258 #define SK_ENABLE_INST_COUNT 0
262 #define GR_GL_CUSTOM_SETUP_HEADER "GrGLConfig_chrome.h" 259 #define GR_GL_CUSTOM_SETUP_HEADER "GrGLConfig_chrome.h"
263 260
264 // Blink layout tests are baselined to Clang optimizing through the UB in SkDivB its. 261 // Blink layout tests are baselined to Clang optimizing through the UB in SkDivB its.
265 #define SK_SUPPORT_LEGACY_DIVBITS_UB 262 #define SK_SUPPORT_LEGACY_DIVBITS_UB
266 263
267 // mtklein's fiddling with Src / SrcOver. Will rebaseline these only once when done. 264 // mtklein's fiddling with Src / SrcOver. Will rebaseline these only once when done.
268 #define SK_SUPPORT_LEGACY_X86_BLITS 265 #define SK_SUPPORT_LEGACY_X86_BLITS
269 266
270 #define SK_DISABLE_TILE_IMAGE_FILTER_OPTIMIZATION 267 #define SK_DISABLE_TILE_IMAGE_FILTER_OPTIMIZATION
271 268
272 // ===== End Chrome-specific definitions ===== 269 // ===== End Chrome-specific definitions =====
273 270
274 #endif 271 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698