Mesa (master): dri: don't touch the shader compiler

Matt Turner mattst88 at kemper.freedesktop.org
Mon Jun 29 16:39:44 UTC 2015


Module: Mesa
Branch: master
Commit: ba5e1612c892282b930e278b5b98f1578cbe7dbb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba5e1612c892282b930e278b5b98f1578cbe7dbb

Author: Erik Faye-Lund <kusmabite at gmail.com>
Date:   Sun Jun 28 14:51:05 2015 +0200

dri: don't touch the shader compiler

This function is for deleting per-screen resources, and the shader
compiler resources are not of such nature. Besides, dri shouldn't
need to even know about the presence of a shader compiler.

These resources will already be released when mesa gets unloaded,
and that should be sufficient.

Signed-off-by: Erik Faye-Lund <kusmabite at gmail.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/drivers/dri/common/dri_util.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index e7ababe..ae4592c 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -46,7 +46,6 @@
 #include "dri_util.h"
 #include "utils.h"
 #include "xmlpool.h"
-#include "../glsl/glsl_parser_extras.h"
 #include "main/mtypes.h"
 #include "main/version.h"
 #include "main/errors.h"
@@ -238,8 +237,6 @@ static void driDestroyScreen(__DRIscreen *psp)
 	 * stream open to the X-server anymore.
 	 */
 
-       _mesa_destroy_shader_compiler();
-
 	psp->driver->DestroyScreen(psp);
 
 	driDestroyOptionCache(&psp->optionCache);




More information about the mesa-commit mailing list