fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: fix a segfault when prog->sh.data is NULL

Browse source 
Broken by:
   st/mesa: get Version from gl_program rather than gl_shader_program

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Marek Olšák 2017-01-05 13:47:15 +01:00
parent 37f9262064
commit 3477f67057
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/state_tracker/st_atom_texture.c
View file

@ -123,11 +123,13 @@ update_textures(struct st_context *st,
struct pipe_sampler_view *sampler_view = NULL;
if (samplers_used & 1) {
/* prog->sh.data is NULL if it's ARB_fragment_program */
unsigned glsl_version = prog->sh.data ? prog->sh.data->Version : 0;
const GLuint texUnit = prog->SamplerUnits[unit];
GLboolean retval;
retval = update_single_texture(st, &sampler_view, texUnit,
prog->sh.data->Version);
glsl_version);
if (retval == GL_FALSE)
continue;