From 8d0a37a705d6b242672da7527d0f83397d162ac8 Mon Sep 17 00:00:00 2001 From: Carl Worth <cworth@cworth.org> Date: Thu, 16 Aug 2012 13:39:10 -0700 Subject: [PATCH] Track updates to "apitrace trim" which no longer drops glBindTexture calls We still aren't sure *why* apitrace trim should have to leave these calls around, but we have a trace which only passes the trim-stress-test if these calls are untrimmed. While that mystery waits to be solved, make the test here compatible with the current behavior. --- cli/cli-trim-unused-textures.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/cli-trim-unused-textures.script b/cli/cli-trim-unused-textures.script index 42ce30f..a82555e 100644 --- a/cli/cli-trim-unused-textures.script +++ b/cli/cli-trim-unused-textures.script @@ -13,7 +13,7 @@ apitrace trim --calls=10,31,50,71,87,88 glxsimple.trace # Verify that we actually trimmed what we wanted to apitrace diff --diff=diff glxsimple.trace glxsimple-trim.trace -expect "44,46d43\n< glGenTextures(1, &1)\n< glBindTexture(GL_TEXTURE_2D, 1)\n< glTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, blob(3))\n48,57d44\n< glBegin(GL_QUADS)\n< glTexCoord2f(0, 0)\n< glVertex2f(0, 0)\n< glTexCoord2f(1, 0)\n< glVertex2f(64, 0)\n< glTexCoord2f(1, 1)\n< glVertex2f(64, 64)\n< glTexCoord2f(0, 1)\n< glVertex2f(0, 64)\n< glEnd()\n59,60d45\n< glXSwapBuffers(0x236a280, 41943041)\n< \n" +expect "44d43\n< glGenTextures(1, &1)\n46d44\n< glTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, blob(3))\n48,57d45\n< glBegin(GL_QUADS)\n< glTexCoord2f(0, 0)\n< glVertex2f(0, 0)\n< glTexCoord2f(1, 0)\n< glVertex2f(64, 0)\n< glTexCoord2f(1, 1)\n< glVertex2f(64, 64)\n< glTexCoord2f(0, 1)\n< glVertex2f(0, 64)\n< glEnd()\n59,60d46\n< glXSwapBuffers(0x236a280, 41943041)\n< \n" # Generate output images for all frames in the trimmed trace -- 2.45.2