diff options
author | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
commit | 008a8d8051786badb83e455bd9281103ba9a6470 (patch) | |
tree | f99ea672d105271cb60a726fac8022ce47ea2866 /mesalib/src/mapi/glapi/gen/INTEL_performance_query.xml | |
parent | 912e881bec8b16f2331225960645c3bdf5a8ba2d (diff) | |
parent | e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f (diff) | |
download | vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.gz vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.bz2 vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftfntfmt.c
freetype/src/cache/ftcimage.c
freetype/src/cid/cidriver.c
freetype/src/truetype/ttdriver.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
openssl/Makefile
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/INTEL_performance_query.xml')
-rw-r--r-- | mesalib/src/mapi/glapi/gen/INTEL_performance_query.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mesalib/src/mapi/glapi/gen/INTEL_performance_query.xml b/mesalib/src/mapi/glapi/gen/INTEL_performance_query.xml index 25cd1817f..9573cb1bd 100644 --- a/mesalib/src/mapi/glapi/gen/INTEL_performance_query.xml +++ b/mesalib/src/mapi/glapi/gen/INTEL_performance_query.xml @@ -5,21 +5,21 @@ <category name="GL_INTEL_performance_query" number="443"> - <function name="GetFirstPerfQueryIdINTEL" offset="assign" static_dispatch="false" es2="2.0"> + <function name="GetFirstPerfQueryIdINTEL" es2="2.0"> <param name="queryId" type="GLuint *"/> </function> - <function name="GetNextPerfQueryIdINTEL" offset="assign" static_dispatch="false" es2="2.0"> + <function name="GetNextPerfQueryIdINTEL" es2="2.0"> <param name="queryId" type="GLuint"/> <param name="nextQueryId" type="GLuint *"/> </function> - <function name="GetPerfQueryIdByNameINTEL" offset="assign" static_dispatch="false" es2="2.0"> + <function name="GetPerfQueryIdByNameINTEL" es2="2.0"> <param name="queryName" type="GLchar *"/> <param name="queryId" type="GLuint *"/> </function> - <function name="GetPerfQueryInfoINTEL" offset="assign" static_dispatch="false" es2="2.0"> + <function name="GetPerfQueryInfoINTEL" es2="2.0"> <param name="queryId" type="GLuint"/> <param name="queryNameLength" type="GLuint"/> <param name="queryName" type="GLchar *"/> @@ -29,7 +29,7 @@ <param name="capsMask" type="GLuint *"/> </function> - <function name="GetPerfCounterInfoINTEL" offset="assign" static_dispatch="false" es2="2.0"> + <function name="GetPerfCounterInfoINTEL" es2="2.0"> <param name="queryId" type="GLuint"/> <param name="counterId" type="GLuint"/> <param name="counterNameLength" type="GLuint"/> @@ -43,24 +43,24 @@ <param name="rawCounterMaxValue" type="GLuint64 *"/> </function> - <function name="CreatePerfQueryINTEL" offset="assign" static_dispatch="false" es2="2.0"> + <function name="CreatePerfQueryINTEL" es2="2.0"> <param name="queryId" type="GLuint"/> <param name="queryHandle" type="GLuint *"/> </function> - <function name="DeletePerfQueryINTEL" offset="assign" static_dispatch="false" es2="2.0"> + <function name="DeletePerfQueryINTEL" es2="2.0"> <param name="queryHandle" type="GLuint"/> </function> - <function name="BeginPerfQueryINTEL" offset="assign" static_dispatch="false" es2="2.0"> + <function name="BeginPerfQueryINTEL" es2="2.0"> <param name="queryHandle" type="GLuint"/> </function> - <function name="EndPerfQueryINTEL" offset="assign" static_dispatch="false" es2="2.0"> + <function name="EndPerfQueryINTEL" es2="2.0"> <param name="queryHandle" type="GLuint"/> </function> - <function name="GetPerfQueryDataINTEL" offset="assign" static_dispatch="false" es2="2.0"> + <function name="GetPerfQueryDataINTEL" es2="2.0"> <param name="queryHandle" type="GLuint"/> <param name="flags" type="GLuint"/> <param name="dataSize" type="GLsizei"/> |