Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / include / gpu / GrConfig.h

diff --git a/src/third_party/skia/include/gpu/GrConfig.h b/src/third_party/skia/include/gpu/GrConfig.h
index cbdb350..80897a0 100644 (file)
--- a/src/third_party/skia/include/gpu/GrConfig.h
+++ b/src/third_party/skia/include/gpu/GrConfig.h
@@ -197,13 +197,13 @@ typedef unsigned __int64 uint64_t;
 #endif
 
 /**
- * GR_GEOM_BUFFER_LOCK_THRESHOLD gives a threshold (in bytes) for when Gr should
- * lock a GrGeometryBuffer to update its contents. It will use lock() if the
+ * GR_GEOM_BUFFER_MAP_THRESHOLD gives a threshold (in bytes) for when Gr should
+ * map a GrGeometryBuffer to update its contents. It will use map() if the
  * size of the updated region is greater than the threshold. Otherwise it will
  * use updateData().
  */
-#if !defined(GR_GEOM_BUFFER_LOCK_THRESHOLD)
-    #define GR_GEOM_BUFFER_LOCK_THRESHOLD (1 << 15)
+#if !defined(GR_GEOM_BUFFER_MAP_THRESHOLD)
+    #define GR_GEOM_BUFFER_MAP_THRESHOLD (1 << 15)
 #endif
 
 /**
@@ -232,4 +232,16 @@ typedef unsigned __int64 uint64_t;
     #define GR_STROKE_PATH_RENDERING                 0
 #endif
 
+/**
+ * GR_ALWAYS_ALLOCATE_ON_HEAP determines whether various temporary buffers created
+ * in the GPU backend are always allocated on the heap or are allowed to be
+ * allocated on the stack for smaller memory requests.
+ *
+ * This is only used for memory buffers that are created and then passed through to the
+ * 3D API (e.g. as texture or geometry data)
+ */
+#if !defined(GR_ALWAYS_ALLOCATE_ON_HEAP)
+    #define GR_ALWAYS_ALLOCATE_ON_HEAP 0
+#endif
+
 #endif