From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 13 Apr 2009 15:23:21 +0000 (+0100)
Subject: Rename to apitrace.
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=163f6d87c524b9e20e7f27cbe133c039c93285aa;p=apitrace

Rename to apitrace.

Since we support more than d3d.
---

diff --git a/README b/README
index f061237..f169706 100644
--- a/README
+++ b/README
@@ -66,7 +66,7 @@ See the scons manpage for more info.
 
 = Usage =
 
-* Copy d3d8.dll/d3d9.dll, d3dtrace.xsl, d3dtrace.css to the directory with the application you want to trace.
+* Copy d3d8.dll/d3d9.dll, apitrace.xsl, apitrace.css to the directory with the application you want to trace.
 * Run the application.
 * Open the output XML file with Firefox or Internet Explorer to view the log.
 * For long XML files is better to use xml2txt.py script.
diff --git a/SConstruct b/SConstruct
index 84564c4..a615373 100644
--- a/SConstruct
+++ b/SConstruct
@@ -162,21 +162,21 @@ env.Default(opengl32)
 env.Tool('packaging')
 
 zip = env.Package(
-    NAME           = 'd3dtrace',
-    VERSION        = '0.2',
+    NAME           = 'apitrace',
+    VERSION        = '0.3',
     PACKAGEVERSION = 0,
     PACKAGETYPE    = 'zip',
     LICENSE        = 'lgpl',
-    SUMMARY        = 'Tool to trace Direct3D API calls from applications.',
-    SOURCE_URL     = 'http://cgit.freedesktop.org/~jrfonseca/d3dtrace/',
+    SUMMARY        = 'Tool to trace Direct3D & OpenGL API calls from applications.',
+    SOURCE_URL     = 'http://cgit.freedesktop.org/~jrfonseca/apitrace/',
     source = [
         'README',
         'COPYING',
         'COPYING.LESSER',
         'd3d8.dll',
         'd3d9.dll',
-        'd3dtrace.xsl',
-        'd3dtrace.css',
+        'apitrace.xsl',
+        'apitrace.css',
         'xml2txt.py',
     ],
 )
diff --git a/apitrace.css b/apitrace.css
new file mode 100644
index 0000000..8f08bf6
--- /dev/null
+++ b/apitrace.css
@@ -0,0 +1,92 @@
+/****************************************************************************
+ *
+ * Copyright 2008 Tungsten Graphics, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ ****************************************************************************/
+
+body {
+	font-family: verdana, sans-serif;
+	font-size: 11px;
+	font-weight: normal;
+	text-align : left;
+}
+
+ul.calls {
+	list-style: none;
+	margin-left: 0px;
+	padding-left: 0px;
+}
+
+ul.args {
+	display:inline;
+	list-style: none;
+	margin-left: 0px;
+	padding-left: 0px;
+}
+
+ul.args li {
+	display:inline;
+}
+
+ul.elems {
+	list-style: none;
+	margin-left: 2em;
+	padding-left: 0px;
+}
+
+ul.elems li {
+	display:block;
+}
+
+.fun {
+	font-weight: bold;
+}
+
+.var {
+	font-style: italic;
+}
+
+.typ {
+	display: none;
+}
+
+.lit {
+	color: #0000ff;
+}
+
+.addr {
+	color: #008000;
+}
+
+.ref {
+	position: relative;
+	cursor: help;
+}
+
+.def {
+	display: none;
+	position: absolute;
+	top: 1.5em;
+	left: 0;
+	width: 32em;
+	background: #f7f7f7;
+	cursor: default;
+}
+
+.ref:hover .def {
+	display: block;
+}
+
diff --git a/apitrace.xsl b/apitrace.xsl
new file mode 100644
index 0000000..1e0b631
--- /dev/null
+++ b/apitrace.xsl
@@ -0,0 +1,131 @@
+<?xml version="1.0"?>
+
+<!--
+
+Copyright 2008 Tungsten Graphics, Inc.
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+!-->
+
+<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+	<xsl:output method="html" />
+
+	<xsl:strip-space elements="*" />
+
+	<xsl:template match="/trace">
+		<html>
+			<head>
+				<title>D3D Trace</title>
+				<link rel="stylesheet" type="text/css" href="apitrace.css"/>
+			</head>
+			<body>
+				<ul class="calls">
+					<xsl:apply-templates/>
+				</ul>
+			</body>
+		</html>
+	</xsl:template>
+
+	<xsl:template match="call">
+		<li>
+			<span class="fun">
+				<xsl:value-of select="@name"/>
+			</span>
+			<xsl:text>(</xsl:text>
+			<ul class="args">
+				<xsl:apply-templates select="arg"/>
+			</ul>
+			<xsl:text>)</xsl:text>
+			<xsl:apply-templates select="ret"/>
+		</li>
+	</xsl:template>
+
+	<xsl:template match="arg|elem">
+		<li>
+			<xsl:apply-templates select="@type"/>
+			<xsl:apply-templates select="@name"/>
+			<xsl:text> = </xsl:text>
+			<xsl:call-template name="compound"/>
+			<xsl:if test="position() != last()">
+				<xsl:text>, </xsl:text>
+			</xsl:if>
+		</li>
+	</xsl:template>
+
+	<xsl:template match="@type">
+		<xsl:attribute name="title">
+			<xsl:value-of select="."/>
+		</xsl:attribute>
+	</xsl:template>
+
+	<xsl:template match="@name">
+		<span class="var">
+			<xsl:value-of select="."/>
+		</span>
+	</xsl:template>
+
+	<xsl:template match="ret">
+		<xsl:text> = </xsl:text>
+		<xsl:call-template name="compound"/>
+	</xsl:template>
+
+	<xsl:template match="ref">
+		<xsl:choose>
+			<xsl:when test="elem">
+				<span class="ref">
+					<xsl:apply-templates select="@addr"/>
+					<span class="def">
+						<xsl:call-template name="compound"/>
+					</span>
+				</span>
+			</xsl:when>
+			<xsl:when test="*">
+				<xsl:text>&amp;</xsl:text>
+				<xsl:apply-templates />
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates select="@addr"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template match="@addr">
+		<span class="addr">
+			<xsl:value-of select="."/>
+		</span>
+	</xsl:template>
+
+	<xsl:template match="text()">
+		<span class="lit">
+			<xsl:value-of select="."/>
+		</span>
+	</xsl:template>
+
+	<xsl:template name="compound">
+		<xsl:choose>
+			<xsl:when test="elem">
+				<xsl:text>{</xsl:text>
+				<ul class="elems">
+					<xsl:apply-templates />
+				</ul>
+				<xsl:text>}</xsl:text>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates />
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+</xsl:transform>
diff --git a/d3dtrace.css b/d3dtrace.css
deleted file mode 100644
index 8f08bf6..0000000
--- a/d3dtrace.css
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
- *
- * Copyright 2008 Tungsten Graphics, Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- ****************************************************************************/
-
-body {
-	font-family: verdana, sans-serif;
-	font-size: 11px;
-	font-weight: normal;
-	text-align : left;
-}
-
-ul.calls {
-	list-style: none;
-	margin-left: 0px;
-	padding-left: 0px;
-}
-
-ul.args {
-	display:inline;
-	list-style: none;
-	margin-left: 0px;
-	padding-left: 0px;
-}
-
-ul.args li {
-	display:inline;
-}
-
-ul.elems {
-	list-style: none;
-	margin-left: 2em;
-	padding-left: 0px;
-}
-
-ul.elems li {
-	display:block;
-}
-
-.fun {
-	font-weight: bold;
-}
-
-.var {
-	font-style: italic;
-}
-
-.typ {
-	display: none;
-}
-
-.lit {
-	color: #0000ff;
-}
-
-.addr {
-	color: #008000;
-}
-
-.ref {
-	position: relative;
-	cursor: help;
-}
-
-.def {
-	display: none;
-	position: absolute;
-	top: 1.5em;
-	left: 0;
-	width: 32em;
-	background: #f7f7f7;
-	cursor: default;
-}
-
-.ref:hover .def {
-	display: block;
-}
-
diff --git a/d3dtrace.xsl b/d3dtrace.xsl
deleted file mode 100644
index 3a786df..0000000
--- a/d3dtrace.xsl
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-
-Copyright 2008 Tungsten Graphics, Inc.
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published
-by the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-!-->
-
-<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:output method="html" />
-
-	<xsl:strip-space elements="*" />
-
-	<xsl:template match="/trace">
-		<html>
-			<head>
-				<title>D3D Trace</title>
-				<link rel="stylesheet" type="text/css" href="d3dtrace.css"/>
-			</head>
-			<body>
-				<ul class="calls">
-					<xsl:apply-templates/>
-				</ul>
-			</body>
-		</html>
-	</xsl:template>
-
-	<xsl:template match="call">
-		<li>
-			<span class="fun">
-				<xsl:value-of select="@name"/>
-			</span>
-			<xsl:text>(</xsl:text>
-			<ul class="args">
-				<xsl:apply-templates select="arg"/>
-			</ul>
-			<xsl:text>)</xsl:text>
-			<xsl:apply-templates select="ret"/>
-		</li>
-	</xsl:template>
-
-	<xsl:template match="arg|elem">
-		<li>
-			<xsl:apply-templates select="@type"/>
-			<xsl:apply-templates select="@name"/>
-			<xsl:text> = </xsl:text>
-			<xsl:call-template name="compound"/>
-			<xsl:if test="position() != last()">
-				<xsl:text>, </xsl:text>
-			</xsl:if>
-		</li>
-	</xsl:template>
-
-	<xsl:template match="@type">
-		<xsl:attribute name="title">
-			<xsl:value-of select="."/>
-		</xsl:attribute>
-	</xsl:template>
-
-	<xsl:template match="@name">
-		<span class="var">
-			<xsl:value-of select="."/>
-		</span>
-	</xsl:template>
-
-	<xsl:template match="ret">
-		<xsl:text> = </xsl:text>
-		<xsl:call-template name="compound"/>
-	</xsl:template>
-
-	<xsl:template match="ref">
-		<xsl:choose>
-			<xsl:when test="elem">
-				<span class="ref">
-					<xsl:apply-templates select="@addr"/>
-					<span class="def">
-						<xsl:call-template name="compound"/>
-					</span>
-				</span>
-			</xsl:when>
-			<xsl:when test="*">
-				<xsl:text>&amp;</xsl:text>
-				<xsl:apply-templates />
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:apply-templates select="@addr"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-	<xsl:template match="@addr">
-		<span class="addr">
-			<xsl:value-of select="."/>
-		</span>
-	</xsl:template>
-
-	<xsl:template match="text()">
-		<span class="lit">
-			<xsl:value-of select="."/>
-		</span>
-	</xsl:template>
-
-	<xsl:template name="compound">
-		<xsl:choose>
-			<xsl:when test="elem">
-				<xsl:text>{</xsl:text>
-				<ul class="elems">
-					<xsl:apply-templates />
-				</ul>
-				<xsl:text>}</xsl:text>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:apply-templates />
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-</xsl:transform>
diff --git a/log.cpp b/log.cpp
index 5e44bc3..bab893f 100644
--- a/log.cpp
+++ b/log.cpp
@@ -187,7 +187,7 @@ void Open(const char *name) {
     _Open(name, "xml");
     Write("<?xml version='1.0' encoding='UTF-8'?>");
     NewLine();
-    Write("<?xml-stylesheet type='text/xsl' href='d3dtrace.xsl'?>");
+    Write("<?xml-stylesheet type='text/xsl' href='apitrace.xsl'?>");
     NewLine();
     BeginTag("trace");
     NewLine();