Show the current GL context in the state view.

google · Aug 3, 2017 · e311042 · e311042
1 parent 91cbbde
commit e311042
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/gapis/api/gles/gles.api b/gapis/api/gles/gles.api
@@ -620,6 +620,7 @@ class Context {
 // Globals
 ContextID              NextContextID
 map!(u64, ref!Context) Contexts
+ref!Context            CurrentContext
 
 sub ref!Context GetContext() {
   context := Contexts[$Thread]
@@ -632,6 +633,7 @@ sub ref!Context GetContext() {
 
 sub void SetContext(ref!Context context) {
   Contexts[$Thread] = context
+  CurrentContext = context
 }
 
 sub ref!Context CreateContext(ref!Context sharedContext) {

diff --git a/gapis/api/gles/gles.go b/gapis/api/gles/gles.go
@@ -34,6 +34,10 @@ func (s *State) GetContext(thread uint64) *Context {
 	return s.Contexts[thread]
 }
 
+func (s *State) SetThread(thread uint64) {
+	s.CurrentContext = s.GetContext(thread)
+}
+
 func (b *Buffer) GetID() BufferId {
 	if b != nil {
 		return b.ID

diff --git a/gapis/api/templates/mutate.go.tmpl b/gapis/api/templates/mutate.go.tmpl
@@ -146,9 +146,10 @@
       {{if not $r}}ϟb = nil // @no_replay{{end}}
 
       ϟc, ϟt := GetState(ϟs), ϟa.thread
+      ϟc.SetThread(ϟt)
       ϟl := ϟs.MemoryLayout
       ϟo := ϟa.Extras().Observations()
-      _, _, _ = ϟc, ϟl, ϟt
+      _ = ϟl
 
       {{Global "CurrentFunction" $}}
 

diff --git a/gapis/api/test/test.go b/gapis/api/test/test.go
@@ -27,6 +27,9 @@ func (API) GetFramebufferAttachmentInfo(*api.State, uint64, api.FramebufferAttac
 
 func (API) Context(*api.State, uint64) api.Context { return nil }
 
+func (s *State) SetThread(thread uint64) {
+}
+
 func (i Remapped) remap(cmd api.Cmd, s *api.State) (interface{}, bool) {
 	return i, true
 }
diff --git a/gapis/api/vulkan/vulkan.go b/gapis/api/vulkan/vulkan.go
@@ -55,6 +55,9 @@ func (API) Context(s *api.State, thread uint64) api.Context {
 	return VulkanContext{}
 }
 
+func (s *State) SetThread(thread uint64) {
+}
+
 func (API) GetFramebufferAttachmentInfo(state *api.State, thread uint64, attachment api.FramebufferAttachment) (w, h uint32, a uint32, f *image.Format, err error) {
 	w, h, form, i, err := GetState(state).getFramebufferAttachmentInfo(attachment)
 	switch attachment {