Added a command-line option to disable replay optimization.

For gapit video and gapit screenshot, added an option that can
disable replay optimization.

Author: AWoloszyn

cmd/gapit/flags.go

@@ -117,6 +117,7 @@ type (
 			Count   int `help:"number of frames after Start to capture: -1 for all frames"`
 			Minimum int `help:"_return error when less than this number of frames is found"`
 		}
+		NoOpt bool `help:"disables optimization of the replay stream"`
 		CommandFilterFlags
 	}
 	DumpShadersFlags struct {
@@ -228,6 +229,7 @@ type (
 		Gapis GapisFlags
 		Gapir GapirFlags
 		At    flags.U64Slice `help:"command/subcommand index for the screenshot. Empty for last"`
+		NoOpt bool           `help:"disables optimization of the replay stream"`
 	}
 	UnpackFlags struct {
 		Verbose bool `help:"if true, then output will not be truncated"`

cmd/gapit/screenshot.go

@@ -37,7 +37,8 @@ type screenshotVerb struct{ ScreenshotFlags }
 func init() {
 	verb := &screenshotVerb{
 		ScreenshotFlags{
-			At: flags.U64Slice{},
+			At:    flags.U64Slice{},
+			NoOpt: false,
 		},
 	}
 
@@ -77,7 +78,7 @@ func (verb *screenshotVerb) Run(ctx context.Context, flags flag.FlagSet) error {
 
 	command := capture.Command(verb.At[0], verb.At[1:]...)
 
-	if frame, err := getSingleFrame(ctx, command, device, client); err == nil {
+	if frame, err := getSingleFrame(ctx, command, device, client, verb.NoOpt); err == nil {
 		return verb.writeSingleFrame(flipImg(frame), "screenshot.png")
 	} else {
 		return err
@@ -94,12 +95,13 @@ func (verb *screenshotVerb) writeSingleFrame(frame image.Image, fn string) error
 	return png.Encode(out, frame)
 }
 
-func getSingleFrame(ctx context.Context, cmd *path.Command, device *path.Device, client service.Service) (*image.NRGBA, error) {
+func getSingleFrame(ctx context.Context, cmd *path.Command, device *path.Device, client service.Service, noOpt bool) (*image.NRGBA, error) {
 	ctx = log.V{"cmd": cmd.Indices}.Bind(ctx)
 	settings := &service.RenderSettings{MaxWidth: uint32(0xFFFFFFFF), MaxHeight: uint32(0xFFFFFFFF)}
 	iip, err := client.GetFramebufferAttachment(ctx,
 		&service.ReplaySettings{
 			Device: device,
+			DisableReplayOptimization: noOpt,
 		},
 		cmd, api.FramebufferAttachment_Color0, settings, nil)
 	if err != nil {

cmd/gapit/sxs_video.go

@@ -171,7 +171,7 @@ func (verb *videoVerb) sxsVideoSource(
 				Stride: int(v.fbo.Width) * 4,
 				Rect:   image.Rect(0, 0, int(v.fbo.Width), int(v.fbo.Height)),
 			}
-			if frame, err := getFrame(ctx, verb.Max.Width, verb.Max.Height, v.command, device, client); err == nil {
+			if frame, err := getFrame(ctx, verb.Max.Width, verb.Max.Height, v.command, device, client, verb.NoOpt); err == nil {
 				v.rendered = frame
 			} else {
 				v.renderError = err

cmd/gapit/video.go

@@ -59,6 +59,7 @@ func init() {
 	verb.FPS = 5
 	verb.Frames.Count = allTheWay
 	verb.Frames.Minimum = 1
+	verb.NoOpt = false
 	app.AddVerb(&app.Verb{
 		Name:      "video",
 		ShortHelp: "Produce a video or sequence of frames from a .gfxtrace file",
@@ -128,7 +129,7 @@ func (verb *videoVerb) regularVideoSource(
 	for i, e := range eofEvents {
 		i, e := i, e
 		executor(ctx, func(ctx context.Context) error {
-			if frame, err := getFrame(ctx, verb.Max.Width, verb.Max.Height, e.Command, device, client); err == nil {
+			if frame, err := getFrame(ctx, verb.Max.Width, verb.Max.Height, e.Command, device, client, verb.NoOpt); err == nil {
 				rendered[i] = flipImg(frame)
 			} else {
 				errors[i] = err
@@ -326,11 +327,12 @@ func (verb *videoVerb) encodeVideo(ctx context.Context, filepath string, vidFun
 	return nil
 }
 
-func getFrame(ctx context.Context, maxWidth, maxHeight int, cmd *path.Command, device *path.Device, client service.Service) (*image.NRGBA, error) {
+func getFrame(ctx context.Context, maxWidth, maxHeight int, cmd *path.Command, device *path.Device, client service.Service, noOpt bool) (*image.NRGBA, error) {
 	ctx = log.V{"cmd": cmd.Indices}.Bind(ctx)
 	settings := &service.RenderSettings{MaxWidth: uint32(maxWidth), MaxHeight: uint32(maxHeight)}
 	iip, err := client.GetFramebufferAttachment(ctx, &service.ReplaySettings{
 		Device: device,
+		DisableReplayOptimization: noOpt,
 	}, cmd, api.FramebufferAttachment_Color0, settings, nil)
 	if err != nil {
 		return nil, log.Errf(ctx, err, "GetFramebufferAttachment failed at %v", cmd)