diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2008-02-28 21:27:16 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2008-02-28 21:32:36 +0800 |
| commit | 3ffd11f71d021f672b9bc15b3c39c155a0e2fecb (patch) | |
| tree | 38ad2acfd3cb10ff5fa0b7b81de18a76ab6ec3af /src/mesa/main/mtypes.h | |
| parent | 0da03c0aa9ed120fe5ff781a365b503b8ed70e0c (diff) | |
mesa: separate shader program object from shader object.
Currently a callback delete_shader_cb is used for deleting shader
and shader program objects. Mesa detaches all attached shaders in
_mesa_free_shader_program_data when deleting shader program objects. However
it is likely that these shaders have been freed in _mesa_free_shader,
which will result in unexpected behaviour. This fix uses a single callback for
shader program objects and deletes shader program objects before shader objects.
Diffstat (limited to 'src/mesa/main/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index c8718a7f63..da60a469a4 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2202,8 +2202,8 @@ struct gl_shared_state #endif #if FEATURE_ARB_shader_objects - /** Table of both gl_shader and gl_shader_program objects */ struct _mesa_HashTable *ShaderObjects; + struct _mesa_HashTable *ShaderProgramObjects; #endif #if FEATURE_EXT_framebuffer_object |