Specify the api to trace.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e963be186b02c5a682ccbf0f57ec1eb70e4df546..e8820c23936f5b67ccb400819e15b2bb3613c11b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,13 +15,8 @@ include (CMakeParseArguments)
 find_package (OpenGL REQUIRED)
 find_package (GLUT)
 
-find_library (GLEW_glew_LIBRARY GLEW
-       /usr/lib
-)
-
-find_path (GLEW_INCLUDE_DIR GL/glew.h
-      /usr/include/GL
-)
+find_path (GLEW_INCLUDE_DIR GL/glew.h /usr/include/GL)
+find_library (GLEW_glew_LIBRARY GLEW /usr/lib)
 
 if (UNIX)
        link_libraries(m)

diff --git a/apps/gl/CMakeLists.txt b/apps/gl/CMakeLists.txt
index 42688190138f936d2233ae46c4651021656f4cce..69f2b211b6a40606cbdabeaf3c8a86c0ddc5f378 100644 (file)
--- a/apps/gl/CMakeLists.txt
+++ b/apps/gl/CMakeLists.txt
@@ -11,7 +11,7 @@ link_libraries (
     ${OPENGL_gl_LIBRARY}
 )
 
-set (subdir gl)
+set (api gl)
 
 set (targets
     tri
@@ -36,6 +36,7 @@ function (ADD_APP_TEST)
         COMMAND
         python ${CMAKE_SOURCE_DIR}/driver.py
             --build ${APITRACE_BINARY_DIR}
+            --api ${api}
             --ref-dump ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_REF}
             "$<TARGET_FILE:${TEST_TARGET}>"
             ${TEST_ARGS}
@@ -43,37 +44,37 @@ function (ADD_APP_TEST)
 endfunction ()
 
 foreach (target ${targets})
-    add_executable (${subdir}_${target} ${target}.c)
-    set_target_properties (${subdir}_${target} PROPERTIES OUTPUT_NAME ${target})
+    add_executable (${api}_${target} ${target}.c)
+    set_target_properties (${api}_${target} PROPERTIES OUTPUT_NAME ${target})
 
     if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${target}.ref.txt)
         add_test(
-            NAME ${subdir}_${target}
+            NAME ${api}_${target}
             COMMAND python ${CMAKE_SOURCE_DIR}/driver.py
                 --build ${APITRACE_BINARY_DIR}
                 --ref-dump ${CMAKE_CURRENT_SOURCE_DIR}/${target}.ref.txt
-                "$<TARGET_FILE:${subdir}_${target}>"
+                "$<TARGET_FILE:${api}_${target}>"
         )
     endif ()
 endforeach (target)
 
 add_app_test (
     NAME "gl_varray_drawarrays"
-    TARGET ${subdir}_varray
+    TARGET ${api}_varray
     REF varray_drawarrays.ref.txt
     ARGS pointer drawarrays
 )
 
 add_app_test (
     NAME "gl_varray_elements"
-    TARGET ${subdir}_varray
+    TARGET ${api}_varray
     REF varray_drawelements.ref.txt
     ARGS pointer drawelements
 )
 
 add_app_test (
     NAME "gl_varray_interleaved"
-    TARGET ${subdir}_varray
+    TARGET ${api}_varray
     REF varray_interleaved.ref.txt
     ARGS interleaved drawarrays
 )

diff --git a/driver.py b/driver.py
index 31f49fc68a2dfbc3a541379186d63c0342c63b49..8c7d1268bb61e9e2fc2a1b5fe82d14f1f5209979 100755 (executable)
--- a/driver.py
+++ b/driver.py
@@ -65,8 +65,8 @@ def _get_build_program(program):
 
 class TestCase:
 
+    api = 'gl'
     max_frames = None
-
     trace_file = None
 
     def __init__(self, name, args, cwd=None, build=None, results = '.'):
@@ -111,7 +111,8 @@ class TestCase:
             apitrace = _get_build_program('apitrace')
             cmd = [
                 apitrace, 'trace', 
-                '-o', self.trace_file,
+                '--api', self.api,
+                '--output', self.trace_file,
                 '--'
             ] + cmd
         if self.max_frames is not None:
@@ -256,6 +257,10 @@ def main():
     optparser = optparse.OptionParser(
         usage='\n\t%prog [options] -- program [args] ...',
         version='%%prog')
+    optparser.add_option(
+        '-a', '--api', metavar='API',
+        type='string', dest='api', default='gl',
+        help='api to trace')
     optparser.add_option(
         '-B', '--build', metavar='PATH',
         type='string', dest='build', default='..',
@@ -284,6 +289,7 @@ def main():
         build = options.build,
         results = options.results,
     )
+    test.api = options.api
     test.ref_dump = options.ref_dump
 
     test.run()