[Mesa-dev] [PATCH] glsl: join calculate_array_size() and calculate_array_stride()

These helpers are ran for same case the same loop. Here joined their operation so the loop is ran just once. Also fixed out-of-memory condition here. Signed-off-by: Juha-Pekka Heikkila --- src/glsl/linker.cpp | 112 +--- 1 file changed, 37

[Mesa-dev] [PATCH] glsl: join calculate_array_size() and calculate_array_stride()

These helpers are ran for same case the same loop. Here joined their operation so the loop is ran just once. Also fixed out-of-memory condition here. v2: Make the loop simpler to read as per Tapani's suggestion Signed-off-by: Juha-Pekka Heikkila --- src/glsl/linker.cpp

Re: [Mesa-dev] [PATCH 1/3] mesa: rename UniformBlockStageIndex to InterfaceBlockStageIndex

This set was Reviewed-by: Juha-Pekka Heikkila On 28.10.2015 07:38, Jordan Justen wrote: Signed-off-by: Jordan Justen Cc: Samuel Iglesias Gonsálvez Cc: Iago Toral Quiroga --- src/glsl/link_uniform_initializers.cpp | 2 +- src/glsl/linker.cpp| 16

[Mesa-dev] [PATCH] i965: Don't write beyond allocated memory.

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/dri/i965/brw_eu_validate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_eu_validate.c b/src/mesa/drivers/dri/i965/brw_eu_validate.c index eb57962..2de2ea1 100644 --- a/src/mesa/drivers

[Mesa-dev] [PATCH 1/6] mesa/main: in _mesa_unpack_color_index_to_rgba_ubyte() check allocated pointers

Check we really got memory we were asking for. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/pack.c | 8 1 file changed, 8 insertions(+) diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c index d1f368c..da2128d 100644 --- a/src/mesa/main/pack.c +++ b/src/mesa/main/pack.c

[Mesa-dev] [PATCH 0/6] Klocwork set again

Regular patch set about klocwork complaints to avoid segfaulting. /Juha-Pekka Juha-Pekka Heikkila (6): mesa/main: in _mesa_unpack_color_index_to_rgba_ubyte() check allocated pointers nir: Check in register_*_instr() after null pointers meta: react to NULL pointers in

[Mesa-dev] [PATCH 5/6] nir: in insert_phi_nodes() check memory allocations succeeded.

Report memory error and bail out on failure. Signed-off-by: Juha-Pekka Heikkila --- src/glsl/nir/nir_to_ssa.c | 20 +++- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/glsl/nir/nir_to_ssa.c b/src/glsl/nir/nir_to_ssa.c index 9c577fa..ccdbcf3 100644 --- a/src

[Mesa-dev] [PATCH 4/6] util: in _mesa_set_create() mark error if out of memory

added calls to _mesa_error_no_memory() if memory allocation returned null pointer. Signed-off-by: Juha-Pekka Heikkila --- src/util/set.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/set.c b/src/util/set.c index c3252a0..b0baccc 100644 --- a/src/util/set.c

[Mesa-dev] [PATCH 6/6] nir: check malloc return value in print_block()

report error on null return value and bail out. Signed-off-by: Juha-Pekka Heikkila --- src/glsl/nir/nir_print.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/glsl/nir/nir_print.c b/src/glsl/nir/nir_print.c index 9c07950..79c4cd8 100644 --- a/src/glsl/nir/nir_print.c +++ b/src

[Mesa-dev] [PATCH 2/6] nir: Check in register_*_instr() after null pointers

If _mesa_set_create() return null there is low memory. Signed-off-by: Juha-Pekka Heikkila --- src/glsl/nir/nir_lower_vars_to_ssa.c | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/glsl/nir/nir_lower_vars_to_ssa.c b/src/glsl/nir/nir_lower_vars_to_ssa.c index

[Mesa-dev] [PATCH 3/6] meta: react to NULL pointers in create_texture_for_pbo()

Check if null pointers were given and bail out. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/common/meta_tex_subimage.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/src/mesa/drivers/common/meta_tex_subimage.c b/src/mesa/drivers/common/meta_tex_subimage.c index 977ee5a

Re: [Mesa-dev] [PATCH 3/5] nir: add new constant folding infrastructure

On 20.01.2015 21:43, Jason Ekstrand wrote: > > > On Mon, Jan 19, 2015 at 5:01 PM, Connor Abbott > wrote: > > On Mon, Jan 19, 2015 at 4:04 PM, Jason Ekstrand > mailto:ja...@jlekstrand.net>> wrote: > > I've got some specific comments below, but I want to ma

[Mesa-dev] [PATCH 3/6] meta: react to errors in create_texture_for_pbo()

Check if we got requested temporary buffers and no NULL pointer. Signed-off-by: Juha-Pekka Heikkila --- In original patch there was missing '*'s for tmp_pbo and tmp_tex. tmp_pbo will not get value if end up in rehashing and rehashing fails. If tmp_tex does not get value there

[Mesa-dev] [PATCH 6/6] nir: check malloc return value in print_block()

Signed-off-by: Juha-Pekka Heikkila --- src/glsl/nir/nir_print.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/glsl/nir/nir_print.c b/src/glsl/nir/nir_print.c index 9c07950..c250850 100644 --- a/src/glsl/nir/nir_print.c +++ b/src/glsl/nir/nir_print.c @@ -646,6 +646,9 @@ print_block

[Mesa-dev] [PATCH] i965: Use new/delete instead of realloc() in brw_ir_allocator.h

There is no error path available thus instead of giving realloc possibility to fail use new which will never return null pointer and throws bad_alloc on failure. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/dri/i965/brw_ir_allocator.h | 19 +++ 1 file changed, 15

[Mesa-dev] [PATCH] i965: Use new/delete instead of realloc() in brw_ir_allocator.h

There is no error path available thus instead of giving realloc possibility to fail use new which will never return null pointer and throws bad_alloc on failure. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/dri/i965/brw_ir_allocator.h | 16 1 file changed, 12

Re: [Mesa-dev] [PATCH] i965: Use new/delete instead of realloc() in brw_ir_allocator.h

On 11.02.2015 19:02, Matt Turner wrote: > On Wed, Feb 11, 2015 at 6:37 AM, Juha-Pekka Heikkila > wrote: >> There is no error path available thus instead of giving >> realloc possibility to fail use new which will never >> return null pointer and throws bad_alloc on failu

[Mesa-dev] [PATCH] Mesa: Add generated files to .gitignore

src/egl/main/.install-mesa-links src/glx/.install-mesa-links src/mapi/.install-mesa-links src/mesa/drivers/dri/i965/test_fs_cmod_propagation src/mesa/drivers/dri/i965/test_fs_saturate_propagation added to .gitignore files on their own directories Signed-off-by: Juha-Pekka Heikkila --- src/egl

[Mesa-dev] Mesa: Fix performance query id check

In queryid_valid() index is unsigned so checking if it is less than zero is useless. On queryid_to_index() is comment saying 0 is reserved to be invalid thus rule it out. CC: Robert Bragg Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/performance_query.c | 2 +- 1 file changed, 1

[Mesa-dev] i965: Remove duplicate checks

On both sides of the comment on what's being checked are exactly same checks in different order. I took out ones before the comment so comment can stay in place. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/dri/i965/brw_eu_validate.c | 12 1 file changed, 12 dele

Re: [Mesa-dev] Mesa: Fix performance query id check

Oops. Original code can never fail on zero id but my patch is also wrong. Please ignore this patch. /Juha-Pekka On 24.02.2017 15:10, Juha-Pekka Heikkila wrote: In queryid_valid() index is unsigned so checking if it is less than zero is useless. On queryid_to_index() is comment saying 0 is

[Mesa-dev] [PATCH] Mesa: Fix performance query id check

In queryid_valid() fix handling of zero index. CC: Robert Bragg Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/performance_query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/main/performance_query.c b/src/mesa/main/performance_query.c index aa10351

Re: [Mesa-dev] [PATCH 0/9] Mostly trivial clean ups

this set is Reviewed-by: Juha-Pekka Heikkila On 30.07.2015 17:14, Ian Romanick wrote: > All but the last of these patches have been sitting in one tree or > another for quite some time. All of these files were touched as part of > other work, but that work is stalled a bit.

Re: [Mesa-dev] [PATCH 00/15] GLSL memory allocation rework for faster compilation

I forgot to reply here on the list, I've just been talking about this with Tapani face to face. My series rebased and fixed on top of mesa master branch from yesterday is here https://github.com/juhapekka/juha_mesaexperimentals/tree/jenkins Tapani was already taking rebased patches from above

Re: [Mesa-dev] [PATCH 1/8] add megadriver_stub_FILES

This set 1..8 Reviewed-by: Juha-Pekka Heikkila On 06.06.2014 12:16, Adrian Negreanu wrote: > From: Adrian Negreanu > > So that android part can also use $(megadriver_stub_FILES) > > Signed-off-by: Adrian Negreanu > --- > src/mesa/drivers/dri/common/Makefile.am

[Mesa-dev] [PATCH 00/11] Klocwork related set again

o cases where stderr has story about assert but otherwise everything worked. I am still looking at these asserts. "i965: Avoid null access in intelMakeCurrent()" I was a bit iffy if its the same behavior which I replaced. /Juha-Pekka Juha-Pekka Heikkila (11): i965: check

[Mesa-dev] [PATCH 07/11] glsl: Add missing null check in push_back()

Report memory error on realloc failure and don't leak any memory. Signed-off-by: Juha-Pekka Heikkila --- src/glsl/link_atomics.cpp | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/glsl/link_atomics.cpp b/src/glsl/link_atomics.cpp index d92cdb1..fb

[Mesa-dev] [PATCH 02/11] i965: Avoid null access in intelMakeCurrent()

separate two null checks connected with && to their own if branches. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/dri/i965/brw_context.c | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/

[Mesa-dev] [PATCH 03/11] i965: Check calloc return value in gather_statistics_results()

Check calloc return value and report on error, also later skip results handling if there was no memory to store results to. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/dri/i965/brw_performance_monitor.c | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src

[Mesa-dev] [PATCH 08/11] glsl: Check calloc return value in link_intrastage_shaders()

Check calloc return value while adding build-in functions. Signed-off-by: Juha-Pekka Heikkila --- src/glsl/linker.cpp | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 247c828..1fc0213 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl

[Mesa-dev] [PATCH 06/11] glsl: check _mesa_hash_table_create return value in link_uniform_blocks

Signed-off-by: Juha-Pekka Heikkila --- src/glsl/link_uniform_blocks.cpp | 6 ++ src/glsl/linker.cpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/glsl/link_uniform_blocks.cpp b/src/glsl/link_uniform_blocks.cpp index 1a0e643..53a18c93 100644 --- a/src/glsl

[Mesa-dev] [PATCH 09/11] mesa/main: Verify calloc return value in register_surface()

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/vdpau.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/mesa/main/vdpau.c b/src/mesa/main/vdpau.c index d974593..f1b3ece 100644 --- a/src/mesa/main/vdpau.c +++ b/src/mesa/main/vdpau.c @@ -132,6 +132,11 @@ register_surface(struct

[Mesa-dev] [PATCH 05/11] i965/fs: Check variable_storage return value in fs_visitor::visit

check variable_storage() found the requested fs_reg. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index

[Mesa-dev] [PATCH 04/11] i965: Handle miptree creation failure in intel_alloc_texture_storage()

Check intel_miptree_create() return value before using it as a pointer. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/dri/i965/intel_tex.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa/drivers/dri/i965/intel_tex.c b/src/mesa/drivers/dri/i965/intel_tex.c index

[Mesa-dev] [PATCH 11/11] glx: Added missing null check in GetDrawableAttribute()

For GLX_BACK_BUFFER_AGE_EXT query added extra null check. Signed-off-by: Juha-Pekka Heikkila --- src/glx/glx_pbuffer.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c index 8f48093..322f241 100644 --- a/src/glx

[Mesa-dev] [PATCH 01/11] i965: check malloc return value in intel_resolve_map_set()

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/dri/i965/intel_resolve_map.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/drivers/dri/i965/intel_resolve_map.c b/src/mesa/drivers/dri/i965/intel_resolve_map.c index a37afa6..5ed7fd3 100644 --- a/src/mesa/drivers/dri

[Mesa-dev] [PATCH 10/11] mesa/main: In register_surface() verify gl_texture_object was found

Verify _mesa_lookup_texture() returned valid pointer before using it. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/vdpau.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/main/vdpau.c b/src/mesa/main/vdpau.c index f1b3ece..975b812 100644 --- a/src/mesa/main/vdpau.c

[Mesa-dev] [PATCH 1/6] mesa: Add Pixman library to configure.ac

Added '--enable-pixman' (default=no) parameter for autogen and corresponding behaviour to include paths and Pixman library for Mesa if Pixman found. Signed-off-by: Juha-Pekka Heikkila --- configure.ac | 32 1 file changed, 32 insertions(+) di

[Mesa-dev] [PATCH 0/6] Enable Pixman for Mesa

-4.448% WebGL - Aquarium 100 fish-4.094% /Juha-Pekka Juha-Pekka Heikkila (6): mesa: Add Pixman library to configure.ac mesa: Add Pixman usage to texstore.c mesa: Pixman texture conversion rgb to abgr mesa: Pixman texture conversion argb to abgr mesa: Pixman texture conversion argb

[Mesa-dev] [PATCH 5/6] mesa: Pixman texture conversion argb to rgb

If available use Pixman fastpath for texture conversion. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/texstore.c | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 6a55f7a..fff92eb 100644 --- a/src

[Mesa-dev] [PATCH 6/6] mesa: Pixman texture conversion rgb to rgb565 and rgb565_rev

If available use Pixman fastpath for texture conversion. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/texstore.c | 8 1 file changed, 8 insertions(+) diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index fff92eb..3d95fb6 100644 --- a/src/mesa/main/texstore.c

[Mesa-dev] [PATCH 3/6] mesa: Pixman texture conversion rgb to abgr

If available use Pixman fastpath for texture conversion. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/texstore.c | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index a32b406..340fa42 100644 --- a/src/mesa

[Mesa-dev] [PATCH 4/6] mesa: Pixman texture conversion argb to abgr

If available use Pixman fastpath for texture conversion. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/texstore.c | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 340fa42..6a55f7a 100644 --- a/src

[Mesa-dev] [PATCH 2/6] mesa: Add Pixman usage to texstore.c

This patch adds 'pixman_texture_conversion' function which will be used by following patches for converting textures between different pixel formats. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/texstore.c | 65 1 file c

Re: [Mesa-dev] [PATCH 0/6] Enable Pixman for Mesa

On 25.06.2014 23:47, Matt Turner wrote: > On Wed, Jun 25, 2014 at 5:38 AM, Juha-Pekka Heikkila > wrote: >> This is my old set which enable using Pixman on Mesa for some texture >> conversion fast paths. As is this passes Piglit quick set on my IVB. > > Pixman doesn't

[Mesa-dev] [PATCH 2/9] i965: check malloc return value in intel_resolve_map_set()

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/dri/i965/intel_resolve_map.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/drivers/dri/i965/intel_resolve_map.c b/src/mesa/drivers/dri/i965/intel_resolve_map.c index bf6bcf2..bb45231 100644 --- a/src/mesa/drivers/dri

[Mesa-dev] [PATCH 4/9] glsl: Check calloc return value in link_intrastage_shaders()

Check calloc return value while adding build-in functions. Signed-off-by: Juha-Pekka Heikkila --- src/glsl/linker.cpp | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index d588bc6..2f004f1 100644 --- a/src/glsl

[Mesa-dev] [PATCH 3/9] i965: Avoid null access in intelMakeCurrent()

separate two null checks connected with && to their own if branches. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/dri/i965/brw_context.c | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/

[Mesa-dev] [PATCH 0/9] Klocwork patches again

left for another patch. /Juha-Pekka Juha-Pekka Heikkila (9): i965: in set_read_rb_tex_image() check _mesa_meta_bind_rb_as_tex_image() did succeed i965: check malloc return value in intel_resolve_map_set() i965: Avoid null access in intelMakeCurrent() glsl: Check calloc return val

[Mesa-dev] [PATCH 9/9] mesa/main: Check allocations success in _mesa_one_time_init_extension_overrides()

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/extensions.c | 9 + 1 file changed, 9 insertions(+) diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 92e3f0d..cd89e8f 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -602,6 +602,15

[Mesa-dev] [PATCH 1/9] i965: in set_read_rb_tex_image() check _mesa_meta_bind_rb_as_tex_image() did succeed

Check if _mesa_meta_bind_rb_as_tex_image() did give the texture. If no texture was given there is already either GL_INVALID_VALUE or GL_OUT_OF_MEMORY error set in context. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/common/meta_blit.c | 10 +- src/mesa/drivers

[Mesa-dev] [PATCH 6/9] glsl: Check realloc return value in ir_function::matching_signature()

Signed-off-by: Juha-Pekka Heikkila --- src/glsl/ir_function.cpp | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/glsl/ir_function.cpp b/src/glsl/ir_function.cpp index 7d6c2f4..04ab5ab 100644 --- a/src/glsl/ir_function.cpp +++ b/src/glsl/ir_function.cpp @@ -24,6

[Mesa-dev] [PATCH 5/9] loader: Check dlsym() did not fail in libudev_get_device_name_for_fd()

Signed-off-by: Juha-Pekka Heikkila --- src/loader/loader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/loader/loader.c b/src/loader/loader.c index 47e1f58..2205a9c 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -594,6 +594,9 @@ libudev_get_device_name_for_fd(int fd

[Mesa-dev] [PATCH 8/9] i965: Check after malloc success in intel_miptree_alloc_hiz()

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 4 1 file changed, 4 insertions(+) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 2ab0faa..30030d1 100644 --- a/src/mesa/drivers/dri

[Mesa-dev] [PATCH 7/9] i965: Avoid null access in fs_generator::generate_code()

Avoid null access while printing debug infos. On the same go change local variable name to avoid confusion because there already is class member with same name. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 8 ++-- 1 file changed, 6 insertions(+), 2

Re: [Mesa-dev] [PATCH 7/9] i965: Avoid null access in fs_generator::generate_code()

On 03.07.2014 16:26, Pohjolainen, Topi wrote: > On Thu, Jul 03, 2014 at 11:13:17AM +0300, Juha-Pekka Heikkila wrote: >> Avoid null access while printing debug infos. On the same go >> change local variable name to avoid confusion because there >> already is class

Re: [Mesa-dev] [PATCH 2/9] i965: check malloc return value in intel_resolve_map_set()

On 04.07.2014 00:29, Kenneth Graunke wrote: > On Thursday, July 03, 2014 11:13:12 AM Juha-Pekka Heikkila wrote: >> Signed-off-by: Juha-Pekka Heikkila >> --- >> src/mesa/drivers/dri/i965/intel_resolve_map.c | 6 ++ >> 1 file changed, 6 insertions(+) >> >

Re: [Mesa-dev] [PATCH 8/9] i965: Check after malloc success in intel_miptree_alloc_hiz()

On 04.07.2014 00:21, Kenneth Graunke wrote: > On Thursday, July 03, 2014 11:13:18 AM Juha-Pekka Heikkila wrote: >> Signed-off-by: Juha-Pekka Heikkila >> --- >> src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 4 >> 1 file changed, 4 insertions(+) >> >>

Re: [Mesa-dev] [PATCH 1/5] Add GL API support for ARB_copy_image

GLint origInternalFormat = texImage->InternalFormat; > unsigned int origViewClass, newViewClass; > > /* The two textures' internal formats must be compatible according to > @@ -337,19 +333,15 @@ compatible_format(struct gl_context *ctx, const struct > gl_texture_object *origTe > * The internal formats must be identical if not in that table, > * or an INVALID_OPERATION error is generated. > */ > - if (origInternalFormat == internalformat) > - return true; > + if (origInternalFormat == newInternalFormat) > + return GL_TRUE; > > origViewClass = lookup_view_class(ctx, origInternalFormat); > - newViewClass = lookup_view_class(ctx, internalformat); > + newViewClass = lookup_view_class(ctx, newInternalFormat); > if ((origViewClass == newViewClass) && origViewClass != false) > - return true; > + return GL_TRUE; > > - _mesa_error(ctx, GL_INVALID_OPERATION, > - "glTextureView(internalformat %s not compatible with > origtexture %s)", > - _mesa_lookup_enum_by_nr(internalformat), > - _mesa_lookup_enum_by_nr(origInternalFormat)); > - return false; > + return GL_FALSE; > } > /** > * Helper function for TexStorage and teximagemultisample to set immutable > @@ -512,8 +504,12 @@ _mesa_TextureView(GLuint texture, GLenum target, GLuint > origtexture, >return; > } > > - if (!compatible_format(ctx, origTexObj, internalformat)) { > - return; /* Error logged */ > + if (!_mesa_texture_view_compatible_format(ctx, > origTexObj->Image[0][0]->InternalFormat, internalformat)) { > + _mesa_error(ctx, GL_INVALID_OPERATION, > + "glTextureView(internalformat %s not compatible with > origtexture %s)", > + _mesa_lookup_enum_by_nr(internalformat), > + > _mesa_lookup_enum_by_nr(origTexObj->Image[0][0]->InternalFormat)); > + return; > } > > texFormat = _mesa_choose_texture_format(ctx, texObj, target, 0, > diff --git a/src/mesa/main/textureview.h b/src/mesa/main/textureview.h > index 3088ac1..549a13c 100644 > --- a/src/mesa/main/textureview.h > +++ b/src/mesa/main/textureview.h > @@ -29,6 +29,10 @@ > #ifndef TEXTUREVIEW_H > #define TEXTUREVIEW_H > > +GLboolean > +_mesa_texture_view_compatible_format(struct gl_context *ctx, > + GLenum origInternalFormat, > + GLenum newInternalFormat); > > extern void GLAPIENTRY > _mesa_TextureView(GLuint texture, GLenum target, GLuint origtexture, > Other than the small detail on patches 1 and 5 this set, 1..5, is Reviewed-by: Juha-Pekka Heikkila /Juha-Pekka ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 5/5] i965: Add support for ARB_copy_image

On 31.07.2014 21:28, Jason Ekstrand wrote: > This, together with the meta path, provides a almost-complete implemetation > of ARB_copy_image. The only case that won't work is if one of the textures > is compressed and has a pitch greater than INT16_MAX. I think that's good > enough to justify tur

[Mesa-dev] [PATCH] glx: Extra gc null check for glXMakeCurrent

Extra null check before accessing user given context pointer. Signed-off-by: Juha-Pekka Heikkila --- src/glx/glxcurrent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glx/glxcurrent.c b/src/glx/glxcurrent.c index a6884cf..b9f259e 100644 --- a/src/glx/glxcurrent.c

[Mesa-dev] [PATCH] mesa: add assert after calloc before access memory in attrib.c

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/attrib.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index c9332bd..5185f89 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1488,6 +1488,9

[Mesa-dev] [PATCH] glx: Add assert after malloc before accessing memory in glx/clientattrib.c

Signed-off-by: Juha-Pekka Heikkila --- src/glx/clientattrib.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/glx/clientattrib.c b/src/glx/clientattrib.c index 1b306ea..6162b49 100644 --- a/src/glx/clientattrib.c +++ b/src/glx/clientattrib.c @@ -76,6 +76,9

[Mesa-dev] [PATCH 3/3] mesa: Verify memory allocations success in _mesa_PushAttrib

Check if any of the callocs fail and report it with _mesa_error if needed. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/attrib.c | 106 - 1 file changed, 104 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/attrib.c b/src/mesa

[Mesa-dev] [PATCH 0/3] Fix Klocwork found issues

probably will not be causing majority of problems in anycase. Juha-Pekka Heikkila (3): glx: Check malloc return value before accessing memory in glx/clientattrib.c mesa: Verify memory allocations success in _mesa_PushClientAttrib mesa: Verify memory allocations success in

[Mesa-dev] [PATCH 1/3] glx: Check malloc return value before accessing memory in glx/clientattrib.c

Signed-off-by: Juha-Pekka Heikkila --- src/glx/clientattrib.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/glx/clientattrib.c b/src/glx/clientattrib.c index 1b306ea..a26906f 100644 --- a/src/glx/clientattrib.c +++ b/src/glx/clientattrib.c @@ -76,6 +76,11

[Mesa-dev] [PATCH 2/3] mesa: Verify memory allocations success in _mesa_PushClientAttrib

Check if any of the callocs fail and report it with _mesa_error if needed. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/attrib.c | 34 ++ 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index

[Mesa-dev] [PATCH] glx: Add missing null check in gxl/dri2_glx.c

Signed-off-by: Juha-Pekka Heikkila --- src/glx/dri2_glx.c | 4 1 file changed, 4 insertions(+) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 3b33312..bfeebed 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -676,6 +676,10 @@ dri2FlushFrontBuffer(__DRIdrawable

[Mesa-dev] [PATCH 0/3] More Klocwork found issues

Simple memory allocation checks became long patches. Juha-Pekka Heikkila (3): Mesa: Change save_attrib_data() to return boolean mesa: Verify memory allocations success in _mesa_PushClientAttrib mesa: Verify memory allocations success in _mesa_PushAttrib src/mesa/main/attrib.c | 394

[Mesa-dev] [PATCH 3/3] mesa: Verify memory allocations success in _mesa_PushAttrib

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/attrib.c | 320 + 1 file changed, 272 insertions(+), 48 deletions(-) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 87797d1..3083e21 100644 --- a/src/mesa/main/attrib.c +++ b

[Mesa-dev] [PATCH 2/3] mesa: Verify memory allocations success in _mesa_PushClientAttrib

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/attrib.c | 70 ++ 1 file changed, 59 insertions(+), 11 deletions(-) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 3ecf533..87797d1 100644 --- a/src/mesa/main/attrib.c +++ b

[Mesa-dev] [PATCH 1/3] Mesa: Change save_attrib_data() to return boolean

Change save_attrib_data() to return true/false depending on success. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/attrib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 8a2a268..3ecf533 100644 --- a/src/mesa

[Mesa-dev] [PATCH] glx: Add missing null check in DRI2WireToEvent

Signed-off-by: Juha-Pekka Heikkila --- src/glx/dri2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/glx/dri2.c b/src/glx/dri2.c index bcd1f9c..deb50ab 100644 --- a/src/glx/dri2.c +++ b/src/glx/dri2.c @@ -102,6 +102,8 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire

[Mesa-dev] [PATCH 2/5] mesa: Verify memory allocations success in _mesa_PushClientAttrib

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/attrib.c | 70 ++ 1 file changed, 59 insertions(+), 11 deletions(-) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 3ecf533..87797d1 100644 --- a/src/mesa/main/attrib.c +++ b

[Mesa-dev] [PATCH 1/5] Mesa: Change save_attrib_data() to return boolean

Change save_attrib_data() to return true/false depending on success. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/attrib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 8a2a268..3ecf533 100644 --- a/src/mesa

[Mesa-dev] [PATCH 3/5] mesa: Verify memory allocations success in _mesa_PushAttrib

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/attrib.c | 227 +++-- 1 file changed, 144 insertions(+), 83 deletions(-) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 87797d1..e41b981 100644 --- a/src/mesa/main/attrib.c +++ b

[Mesa-dev] [PATCH 0/5] Klocwork related patches

to start handling allocation of the incoming attribute parameter allocation. Added the missing space for patch to DRI2WireToEvent (I blame autoformatter for losing this originally :) ) and new to the Klocwork patch list is patch to dri2CreateDrawable Juha-Pekka Heikkila (5): Mesa: Change

[Mesa-dev] [PATCH 4/5] glx: Add missing null check in DRI2WireToEvent

Signed-off-by: Juha-Pekka Heikkila --- src/glx/dri2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/glx/dri2.c b/src/glx/dri2.c index bcd1f9c..7e8fdea 100644 --- a/src/glx/dri2.c +++ b/src/glx/dri2.c @@ -102,6 +102,8 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire

[Mesa-dev] [PATCH 5/5] glx: Add missing null check in dri2CreateDrawable

Signed-off-by: Juha-Pekka Heikkila --- src/glx/dri2_glx.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index bfeebed..e553004 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -397,6 +397,12 @@ dri2CreateDrawable(struct glx_screen

[Mesa-dev] [PATCH 5/5] glx: add missing null check in dri2_bind_tex_image

Signed-off-by: Juha-Pekka Heikkila --- src/glx/dri2_glx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 309c1e7..b72a859 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -990,6 +990,9 @@ dri2_bind_tex_image(Display * dpy

[Mesa-dev] [PATCH 0/5] More null checks from Klocwork

d not miss any of Brian's comments. Extra null checking in dri2_bind_tex_image is new to my set. /Juha-Pekka Juha-Pekka Heikkila (5): Mesa: Change save_attrib_data() to return boolean mesa: Verify memory allocations success in _mesa_PushClientAttrib mesa: Verify memory allocations

[Mesa-dev] [PATCH 2/5] mesa: Verify memory allocations success in _mesa_PushClientAttrib

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/attrib.c | 70 ++ 1 file changed, 59 insertions(+), 11 deletions(-) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 3ecf533..4ce8923 100644 --- a/src/mesa/main/attrib.c +++ b

[Mesa-dev] [PATCH 1/5] Mesa: Change save_attrib_data() to return boolean

Change save_attrib_data() to return true/false depending on success. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/attrib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 8a2a268..3ecf533 100644 --- a/src/mesa

[Mesa-dev] [PATCH 4/5] glx: Add missing null check in dri2CreateDrawable

Signed-off-by: Juha-Pekka Heikkila --- src/glx/dri2_glx.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index bfeebed..309c1e7 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -366,6 +366,10 @@ dri2CreateDrawable

[Mesa-dev] [PATCH 3/5] mesa: Verify memory allocations success in _mesa_PushAttrib

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/attrib.c | 236 +++-- 1 file changed, 152 insertions(+), 84 deletions(-) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 4ce8923..0671b74 100644 --- a/src/mesa/main/attrib.c +++ b

[Mesa-dev] [PATCH 1/3] glx: add missing null check in dri2_bind_tex_image

Signed-off-by: Juha-Pekka Heikkila --- src/glx/dri2_glx.c | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 309c1e7..ae807ee 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -991,10 +991,14 @@ dri2_bind_tex_image

[Mesa-dev] [PATCH 2/3] glx: Fix two identical null check errors in driSet/GetInterval

Signed-off-by: Juha-Pekka Heikkila --- src/glx/dri_glx.c | 22 ++ 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c index 0b89e3e..91cccac 100644 --- a/src/glx/dri_glx.c +++ b/src/glx/dri_glx.c @@ -747,13 +747,16 @@ static

[Mesa-dev] [PATCH 3/3] Mesa: add asserts in load_texunit_bumpmap

In load_texunit_bumpmap tc_array is asserted so lets assert rot_mat_0 and rot_mat_1 also which are coming from same path. Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/ff_fragment_shader.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src

[Mesa-dev] [PATCH 1/3] glx: Fix two identical null check errors in driSet/GetInterval

Signed-off-by: Juha-Pekka Heikkila --- src/glx/dri_glx.c | 20 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c index 0b89e3e..2e00bf0 100644 --- a/src/glx/dri_glx.c +++ b/src/glx/dri_glx.c @@ -747,13 +747,15 @@ static int

[Mesa-dev] [PATCH 2/3] Mesa: Add asserts into emit_fog_instructions

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/ff_fragment_shader.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index 16715f6..6e91697 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa

[Mesa-dev] [PATCH 3/3] Mesa: Assert variable coming from get_variable() in get_current_attrib

Signed-off-by: Juha-Pekka Heikkila --- src/mesa/main/ff_fragment_shader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index 6e91697..ba6258d 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa

[Mesa-dev] [PATCH] glx: Add missing null checks in glxcmds.c

Signed-off-by: Juha-Pekka Heikkila --- src/glx/glxcmds.c | 28 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index b5377c2..38a5262 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -385,7 +385,9

[Mesa-dev] [PATCH] glx: Add missing null check in __glXCloseDisplay

Signed-off-by: Juha-Pekka Heikkila --- src/glx/glxext.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/glx/glxext.c b/src/glx/glxext.c index 2711e57..4a195bd 100644 --- a/src/glx/glxext.c +++ b/src/glx/glxext.c @@ -269,7 +269,8 @@ __glXCloseDisplay(Display * dpy

[Mesa-dev] [PATCH] glsl: Fix null access on file read error

Signed-off-by: Juha-Pekka Heikkila --- src/glsl/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp index aa188b1..755bc9a 100644 --- a/src/glsl/main.cpp +++ b/src/glsl/main.cpp @@ -221,7 +221,7 @@ load_text_file(void *ctx, const

[Mesa-dev] [PATCH 2/2] glx: Add some missing null checks in glx_pbuffer.c

Signed-off-by: Juha-Pekka Heikkila --- src/glx/glx_pbuffer.c | 19 +++ 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c index 183fbaa..411d6e5 100644 --- a/src/glx/glx_pbuffer.c +++ b/src/glx/glx_pbuffer.c @@ -60,7 +60,7

[Mesa-dev] [PATCH 1/2] glsl: Fix null access on file read error

Signed-off-by: Juha-Pekka Heikkila --- src/glsl/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp index aa188b1..ff69c9a 100644 --- a/src/glsl/main.cpp +++ b/src/glsl/main.cpp @@ -221,7 +221,7 @@ load_text_file(void *ctx, const

[Mesa-dev] [PATCH 0/2] two Klocwork related patches.

on causing a build error. Juha-Pekka Heikkila (2): glsl: Fix null access on file read error glx: Add some missing null checks in glx_pbuffer.c src/glsl/main.cpp | 3 ++- src/glx/glx_pbuffer.c | 19 +++ 2 files changed, 17 insertions(+), 5 deletions(-) -

[Mesa-dev] [PATCH 1/2] glx: Add missing null check in __glXNewIndirectAPI()

Add extra null check in auto generated indirect_init.c via src/mapi/glapi/gen/glX_proto_send.py Signed-off-by: Juha-Pekka Heikkila --- src/mapi/glapi/gen/glX_proto_send.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen

[Mesa-dev] [PATCH 0/2] More null checks into glx

Still Klocwork related patches. Juha-Pekka Heikkila (2): glx: Add missing null check in __glXNewIndirectAPI() glx: check memory allocations in __glXInitVertexArrayState() src/glx/indirect_vertex_array.c | 27 +++ src/mapi/glapi/gen/glX_proto_send.py | 2 ++ 2

[Mesa-dev] [PATCH 2/2] glx: check memory allocations in __glXInitVertexArrayState()

Signed-off-by: Juha-Pekka Heikkila --- src/glx/indirect_vertex_array.c | 27 +++ 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/glx/indirect_vertex_array.c b/src/glx/indirect_vertex_array.c index 1d26c5e..0025cbb 100644 --- a/src/glx

  1   2   3   4   5   >