From 25dd80555d895fbe98e8f8099283992d350f22a2 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 24 Jan 2012 15:19:50 -0800 Subject: [PATCH] mesa: Fix display list handling for EXT_framebuffer_object. Noticed when handling a similar problem in EXT_framebuffer_multisample. From the EXT_framebuffer_object spec: Added to section 5.4, as part of the discussion of which commands are not compiled into display lists: "Certain commands, when called while compiling a display list, are not compiled into the display list but are executed immediately. These are: ..., GenFramebuffersEXT, BindFramebufferEXT, DeleteFramebuffersEXT, CheckFramebufferStatusEXT, GenRenderbuffersEXT, BindRenderbufferEXT, DeleteRenderbuffersEXT, RenderbufferStorageEXT, FramebufferTexture1DEXT, FramebufferTexture2DEXT, FramebufferTexture3DEXT, FramebufferRenderbufferEXT, GenerateMipmapEXT..." Reviewed-by: Brian Paul --- src/mesa/main/dlist.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 95b8211b23c..fed487b9aa6 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -46,6 +46,9 @@ #include "dlist.h" #include "enums.h" #include "eval.h" +#if FEATURE_EXT_framebuffer_object +#include "fbobject.h" +#endif #include "framebuffer.h" #include "glapi/glapi.h" #include "hash.h" @@ -10112,6 +10115,21 @@ _mesa_create_save_table(void) SET_GenVertexArraysAPPLE(table, _mesa_GenVertexArraysAPPLE); SET_IsVertexArrayAPPLE(table, _mesa_IsVertexArrayAPPLE); + /* 310. GL_EXT_framebuffer_object */ + SET_GenFramebuffersEXT(table, _mesa_GenFramebuffersEXT); + SET_BindFramebufferEXT(table, _mesa_BindFramebufferEXT); + SET_DeleteFramebuffersEXT(table, _mesa_DeleteFramebuffersEXT); + SET_CheckFramebufferStatusEXT(table, _mesa_CheckFramebufferStatusEXT); + SET_GenRenderbuffersEXT(table, _mesa_GenRenderbuffersEXT); + SET_BindRenderbufferEXT(table, _mesa_BindRenderbufferEXT); + SET_DeleteRenderbuffersEXT(table, _mesa_DeleteRenderbuffersEXT); + SET_RenderbufferStorageEXT(table, _mesa_RenderbufferStorageEXT); + SET_FramebufferTexture1DEXT(table, _mesa_FramebufferTexture1DEXT); + SET_FramebufferTexture2DEXT(table, _mesa_FramebufferTexture2DEXT); + SET_FramebufferTexture3DEXT(table, _mesa_FramebufferTexture3DEXT); + SET_FramebufferRenderbufferEXT(table, _mesa_FramebufferRenderbufferEXT); + SET_GenerateMipmapEXT(table, _mesa_GenerateMipmapEXT); + /* GL_ARB_vertex_array_object */ SET_BindVertexArray(table, _mesa_BindVertexArray); SET_GenVertexArrays(table, _mesa_GenVertexArrays); -- 2.30.2