diff options
| author | Marek Olšák <[email protected]> | 2019-04-24 13:02:43 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-04-24 20:45:15 -0400 |
| commit | 45ca7798dc32c1cb7da8f94af9a7d7400ee9bc12 (patch) | |
| tree | a144981c6a2ac390b3c471ae7425c785600f671a /src/mesa | |
| parent | e71936a731a93ddfb3325c41a5a9756175020ee9 (diff) | |
glsl: handle interactions between EXT_gpu_shader4 and texture extensions
also, EXT_texture_buffer_object has to be enabled separately.
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/extensions_table.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 717f64612ff..c3c5f3ac8f0 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -287,7 +287,7 @@ EXT(EXT_texture3D , dummy_true EXT(EXT_texture_array , EXT_texture_array , GLL, GLC, x , x , 2006) EXT(EXT_texture_border_clamp , ARB_texture_border_clamp , x , x , x , ES2, 2014) EXT(EXT_texture_buffer , OES_texture_buffer , x , x , x , 31, 2014) -EXT(EXT_texture_buffer_object , EXT_gpu_shader4 , GLL, x , x , x , 2007) +EXT(EXT_texture_buffer_object , EXT_texture_buffer_object , GLL, x , x , x , 2007) EXT(EXT_texture_compression_bptc , ARB_texture_compression_bptc , x , x , x , 30, 2017) EXT(EXT_texture_compression_dxt1 , ANGLE_texture_compression_dxt , GLL, GLC, ES1, ES2, 2004) EXT(EXT_texture_compression_latc , EXT_texture_compression_latc , GLL, x , x , x , 2006) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 6efd9758417..8a94e632b65 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4281,6 +4281,7 @@ struct gl_extensions GLboolean EXT_sRGB; GLboolean EXT_stencil_two_side; GLboolean EXT_texture_array; + GLboolean EXT_texture_buffer_object; GLboolean EXT_texture_compression_latc; GLboolean EXT_texture_compression_s3tc; GLboolean EXT_texture_compression_s3tc_srgb; diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 7562213907e..560dd7b31a4 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -1113,6 +1113,7 @@ void st_init_extensions(struct pipe_screen *screen, * pipe cap. */ extensions->EXT_gpu_shader4 = GL_TRUE; + extensions->EXT_texture_buffer_object = GL_TRUE; if (screen->get_param(screen, PIPE_CAP_TGSI_ARRAY_COMPONENTS)) extensions->ARB_enhanced_layouts = GL_TRUE; |