[Mesa-dev] [PATCH] mesa/main: Add primitive restart support to glArrayElement

When primitive restart is enabled, and glArrayElement is called with the restart index value, then call glPrimitiveRestartNV. NOTE: This is a candidate for the 8.0 branch. Signed-off-by: Jordan Justen Reviewed-by: Brian Paul --- src/mesa/main/api_arrayelt.c | 10 +- 1 files changed,

[Mesa-dev] [PATCH] i965: fix wrong cube/3D texture layout

Fix wrong cube/3D texture layout for the tailing levels whose width or height is smaller than the align unit. >From 965 B-spec http://intellinuxgraphics.org/VOL_1_graphics_core.pdf at page 135: All of the LOD=0 q-planes are stacked vertically, then below that, the LOD=1 qplanes are stacked t

Re: [Mesa-dev] [PULL demos] eglut: Add wayland support

On Wed, May 02, 2012 at 02:52:03PM +0800, zhiwen...@linux.intel.com wrote: > The following changes since commit ebe0ddf657903bef32a161dc66254fbf8725f986: > > util: add gl_wrap.h and glu_wrap.h to libutil_la_SOURCES (2012-04-23 > 08:21:43 -0600) Thanks, that's a good start. There are still a f

Re: [Mesa-dev] [PATCH 1/4 v2] glsl: consolidate code

On 05/01/2012 05:04 PM, nobled wrote: And lay the groundwork for GL_ARB_debug_output. --- src/glsl/glsl_parser_extras.cpp | 33 +++-- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp

Re: [Mesa-dev] [PATCH 2/4 v2] mesa: add _mesa_shader_debug()

On 05/01/2012 05:04 PM, nobled wrote: This should be the one entrypoint libglsl needs for GL_ARB_debug_output. --- src/mesa/main/errors.c | 34 ++ src/mesa/main/errors.h |4 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/src/mesa/mai

Re: [Mesa-dev] [PATCH 3/4 resend] glsl: add gl_context member

On 05/01/2012 05:04 PM, nobled wrote: --- src/glsl/glsl_parser_extras.cpp |3 ++- src/glsl/glsl_parser_extras.h |3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 6a4ab4a..3d99cc5 100644 ---

Re: [Mesa-dev] [PATCH] mesa/main: Add primitive restart support to glArrayElement

On 05/02/2012 01:12 AM, Jordan Justen wrote: When primitive restart is enabled, and glArrayElement is called with the restart index value, then call glPrimitiveRestartNV. NOTE: This is a candidate for the 8.0 branch. Signed-off-by: Jordan Justen Reviewed-by: Brian Paul --- src/mesa/main/api_a

[Mesa-dev] [PATCH 1/6] dri: add driWarnImmutableTexture()

This warns about trying to respecify a texture marked immutable by GL_ARB_texture_storage. --- src/mesa/drivers/dri/common/dri_util.c | 14 ++ src/mesa/drivers/dri/common/dri_util.h |3 +++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/dri/commo

[Mesa-dev] [PATCH 2/6] swrast: don't modify immutable textures

--- src/mesa/drivers/dri/swrast/swrast.c |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c index 22d71bf..70bbcb8 100644 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swr

[Mesa-dev] [PATCH 3/6] intel: don't modify immutable textures

--- src/mesa/drivers/dri/intel/intel_tex_image.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c index 094d3cd..264cfc1 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_image

[Mesa-dev] [PATCH 4/6] nouveau_vieux: don't modify immutable textures

--- src/mesa/drivers/dri/nouveau/nouveau_texture.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index a2e96aa..8954666 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau

[Mesa-dev] [PATCH 5/6] radeon: don't modify immutable textures

--- src/mesa/drivers/dri/radeon/radeon_texstate.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c b/src/mesa/drivers/dri/radeon/radeon_texstate.c index 87f12d5..932b706 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texs

[Mesa-dev] [PATCH 6/6] st/mesa: don't modify immutable textures

--- src/mesa/state_tracker/st_manager.c |8 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index d54b7ed..5a1fb73 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_

[Mesa-dev] build error in mesa out-of-tree-builds with wayland support

I'm seeing the following error when building Mesa git master out-of-tree with wayland support: , | Making all in dri2 | make[5]: Entering directory `/usr/local/src/deb-src/mesa/mesa/build/dri/src/egl/drivers/dri2' | CC egl_dri2.lo | In file included from egl_dri2.h:40:0, |

[Mesa-dev] [PATCH] dri2proto: Fix documented opcodes

Fix the documented opcodes in dri2proto.txt to be consistent with the actual opcode values in dri2proto.h and in xcb/proto:src/dri2.xml. (It looks like the opcodes were incorrect due to copy-paste errors). CC: Kristian Høgsberg --- dri2proto.txt | 18 +- 1 file changed, 9 inser

[Mesa-dev] [PATCH] gbm: Add gbm_bo_write entry point

This new gbm entry point allows writing data into a gbm bo. The bo has to be created with the GBM_BO_USE_WRITE flag, and it's only required to work for GBM_BO_USE_CURSOR_64X64 bos. The gbm API is designed to be the glue layer between EGL and KMS, but there was never a mechanism initialize a buffe

Re: [Mesa-dev] build error in mesa out-of-tree-builds with wayland support

On Wed, May 2, 2012 at 2:09 PM, Sven Joachim wrote: > I'm seeing the following error when building Mesa git master out-of-tree > with wayland support: > > , > | Making all in dri2 > | make[5]: Entering directory > `/usr/local/src/deb-src/mesa/mesa/build/dri/src/egl/drivers/dri2' > |   CC    

Re: [Mesa-dev] [PATCH] dri2proto: Fix documented opcodes

On Wed, May 2, 2012 at 3:03 PM, Chad Versace wrote: > Fix the documented opcodes in dri2proto.txt to be consistent with the > actual opcode values in dri2proto.h and in xcb/proto:src/dri2.xml. (It > looks like the opcodes were incorrect due to copy-paste errors). Looks correct to me. Kristian >

[Mesa-dev] [PATCH 00/10] i965/gen6: Begin implementing MSAA.

This patch series provides preliminary support for MSAA (multisample antialiasing) in i965/gen6. The key difficulty in implementing MSAA is that we have to allow the user to blit between arbitrary combinations of MSAA and non-MSAA renderbuffers. In particular, we need to be able to blit from an M

[Mesa-dev] [PATCH 01/10] intel: Add extern "C" declarations to headers

These declarations are necessary to allow C++ code to call C code without causing unresolved symbols (which would make the driver fail to load). --- src/mesa/drivers/dri/i965/brw_context.h|7 +++ src/mesa/drivers/dri/i965/brw_eu.h |8 src/mesa/drivers/dri/i

[Mesa-dev] [PATCH 02/10] intel: Work around differences between C and C++ scoping rules.

In C++, if a struct is defined inside another struct, or its name is first seen inside a struct or function, the struct is nested inside the namespace of the struct or function it appears in. In C, all structs are visible from toplevel. This patch explicitly moves the decalartions of intel_batchb

[Mesa-dev] [PATCH 03/10] i965/hiz: Make void pointer type casts explicit

Previous to this patch, gen6_hiz.c contained two implicit type casts from void * to a a non-void pointer type. This is allowed in C but not in C++. This patch makes the type casts explicit, so that gen6_hiz.c can be converted into a C++ file. --- src/mesa/drivers/dri/i965/gen6_hiz.c | 12 +

[Mesa-dev] [PATCH 04/10] i965/hiz: Convert gen{6,7}_hiz.c to C++

This patch converts the files gen6_hiz.c and gen7_hiz.c to C++, in preparation for expanding the HiZ code to support arbitrary blits. The new files are called gen6_blorp.cpp and gen7_blorp.cpp to reflect the expanded role that this code will serve--"blorp" stands for "BLit Or Resolve Pass". --- s

[Mesa-dev] [PATCH 05/10] i965/hiz: Convert gen{6, 7}_hiz.h to gen{6, 7}_blorp.h

This patch renames the gen6_hiz.h and gen7_hiz.h files to correspond to the renames of the corresponding .cpp files (see previous commit). --- src/mesa/drivers/dri/i965/brw_vtbl.c |4 ++-- src/mesa/drivers/dri/i965/gen6_blorp.cpp |2 +- .../drivers/dri/i965/{gen6_hi

[Mesa-dev] [PATCH 06/10] i965: Parameterize HiZ code to prepare for adding blitting.

This patch groups together the parameters used by the HiZ functions into a new data structure, brw_hiz_resolve_params, rather than passing each parameter individually between the HiZ functions. This data structure is a subclass of brw_blorp_params, which represents the parameters of a general-purp

[Mesa-dev] [PATCH 07/10] i965: split gen{6,7}_blorp_exec functions into manageable chunks.

This patch splits up the gen6_blorp_exec and gen7_blorp_exec functions, which were very long, into simple component functions. With a few exceptions, there is one function per state packet. This will allow blit functionality to be added without significantly complicating the code. --- src/mesa/dr

[Mesa-dev] [PATCH 08/10] i965: Expose surface setup internals for use by blits.

This patch exposes the functions brw_get_surface_tiling_bits and gen7_set_surface_tiling, so that they can be re-used when setting up surface states in gen6_blorp.cpp and gen7_blorp.cpp. --- src/mesa/drivers/dri/i965/brw_state.h |2 ++ src/mesa/drivers/dri/i965/brw_wm_surface_state

[Mesa-dev] [PATCH 0/6] Constants through builtins evaluation rewrite

Hello, Here is the second version of that patch series. It's fundamentally the same thing with a number of changes: - respect the coding style a little better - index the hash table on the variable object pointer and not the name - handle function call in function call (tested with atan(a)) - h

[Mesa-dev] [PATCH 1/6] Extend ir_constant::zero to handle more types.

Signed-off-by: Olivier Galibert --- src/glsl/ir.cpp | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp index 1ba8751..d0a6d09 100644 --- a/src/glsl/ir.cpp +++ b/src/glsl/ir.cpp @@ -716,12 +716,27 @@ ir_constant::ir_constant(co

[Mesa-dev] [PATCH 2/6] Add a variable context to constant_expression_value().

Signed-off-by: Olivier Galibert --- src/glsl/ast_function.cpp |2 +- src/glsl/ir.h | 31 +++--- src/glsl/ir_constant_expression.cpp | 42 +-- 3 files changed, 44 insertions(+), 31 deletions(-) diff --git

[Mesa-dev] [PATCH 3/6] Add a constant_referenced method to ir_dereference*

The method is used to get a reference to an ir_constant * within the context of evaluating an assignment when calculating a constant_expression_value. Signed-off-by: Olivier Galibert --- src/glsl/ir.h | 36 ++ src/glsl/ir_constant_expression.cpp | 92 +++

[Mesa-dev] [PATCH 4/6] Add methods to copy parts of on ir_constant into another.

- copy_masked_offset copies part of a constant into another, assign-like. - copy_offset copies a constant into (a subset of) another, funcall-return like. These methods are to be used to trace through assignments and function calls when computing a constant expression. Signed-off-by: Olivier

[Mesa-dev] [PATCH 5/6] Add an origin pointer in the function signature object to the object with the function body for builtins.

Signed-off-by: Olivier Galibert --- src/glsl/ir.cpp |1 + src/glsl/ir.h |3 +++ src/glsl/ir_clone.cpp |1 + 3 files changed, 5 insertions(+) diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp index a6f1b18..afe1d43 100644 --- a/src/glsl/ir.cpp +++ b/src/glsl/ir.cpp @@ -1483

[Mesa-dev] [PATCH 6/6] Change ir_function_signature::constant_expression_value to run through the function.

That removes code duplication with ir_expression::constant_expression_value and builtins/ir/*. Signed-off-by: Olivier Galibert --- src/glsl/ir.h | 15 + src/glsl/ir_constant_expression.cpp | 521 ++- 2 files changed, 156 insertions(+), 380

Re: [Mesa-dev] [PATCH 1/6] Scaffolding for ARB_shader_bit_encoding.

On 04/30/2012 04:19 AM, Olivier Galibert wrote: That adds support for activating the extension. It doesn't actually *do* anything yet, of course. Signed-off-by: Olivier Galibert --- src/glsl/builtins/tools/generate_builtins.py |1 + src/glsl/glcpp/glcpp-parse.y |3 +++

Re: [Mesa-dev] [PATCH 2/6] New unary opcodes for ARB_shader_bit_encoding support.

On 04/30/2012 01:40 PM, Kenneth Graunke wrote: On 04/30/2012 04:19 AM, Olivier Galibert wrote: The opcodes are bf2u, bf2i, bi2f and bu2f, with "b" meaning bitwise conversions. Signed-off-by: Olivier Galibert I can't say I'm crazy about the names bf2u, bf2i, bi2f, and bu2f. It seems like somet

Re: [Mesa-dev] [PATCH 6/6] Bitwise conversion operator support in the software renderers.

On 04/30/2012 11:24 AM, Eric Anholt wrote: On Mon, 30 Apr 2012 13:19:06 +0200, Olivier Galibert wrote: TGSI doesn't need an opcode, since registers are untyped (but beware once doubles come into the scene). Mesa needs two because registers are typed float. They're not going to work anyway, gi

Re: [Mesa-dev] [PATCH 06/10] i965: Parameterize HiZ code to prepare for adding blitting.

+void +brw_blorp_params::exec(struct intel_context *intel) const +{ + switch (intel->gen) { + case 6: + gen6_blorp_exec(intel, this); + break; + case 7: + gen7_blorp_exec(intel, this); + break; + default: + /* BLORP is not supported before Gen7. */ + assert(fal

Re: [Mesa-dev] [PATCH 5/5] Change ir_function_signature::constant_expression_value to run through the function.

On Mon, Apr 30, 2012 at 11:45:50AM -0700, Eric Anholt wrote: > I'm concerned that this will turn things that shouldn't be constant > expressions in GLSL (some user-defined function just using its > (constant) arguments and constants) and treating them as constant > expressions. Do we have tests fo

Re: [Mesa-dev] [PATCH 1/6] Scaffolding for ARB_shader_bit_encoding.

On Wed, May 02, 2012 at 02:17:31PM -0700, Ian Romanick wrote: > I've been trying to keep this list alphabetized. Ok. > > + if (ctx->Const.NativeIntegers) { > > + ctx->Extensions.ARB_shader_bit_encoding = GL_TRUE; > > + } > > + > > Is this actually true? It seems like there's some GL 3.

Re: [Mesa-dev] [PATCH 1/2] i965: Fix mipmap offsets for HiZ and separate stencil buffers.

On 26 April 2012 16:40, Chad Versace wrote: > A few comments below. > > On 04/24/2012 12:23 PM, Paul Berry wrote: > > When rendering to a miplevel other than 0 within a color, depth, > > stencil, or HiZ buffer, we need to tell the GPU to render to an offset > > within the buffer, so that the data

[Mesa-dev] [PATCH v2] i965: Fix mipmap offsets for HiZ and separate stencil buffers.

When rendering to a miplevel other than 0 within a color, depth, stencil, or HiZ buffer, we need to tell the GPU to render to an offset within the buffer, so that the data is written into the correct miplevel. We do this using a coarse offset (in pages), and a fine adjustment (the so-called "tile_

Re: [Mesa-dev] build error in mesa out-of-tree-builds with wayland support

On 2012-05-02 21:51 +0200, Kristian Høgsberg wrote: > On Wed, May 2, 2012 at 2:09 PM, Sven Joachim wrote: >> I'm seeing the following error when building Mesa git master out-of-tree >> with wayland support: >> >> , >> | Making all in dri2 >> | make[5]: Entering directory >> `/usr/local/src/d

Re: [Mesa-dev] build error in mesa out-of-tree-builds with wayland support

This fixes it here - diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am index e4d4abb..49ec06b 100644 --- a/src/egl/drivers/dri2/Makefile.am +++ b/src/egl/drivers/dri2/Makefile.am @@ -26,6 +26,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/gbm/backends/dri \ -

[Mesa-dev] [PATCH] egl_dri2: Fix out of tree builds with the wayland backend enabled

Otherwise it fails like so: CC egl_dri2.lo In file included from egl_dri2.h:40:0, from egl_dri2.c:42: ../../../../../../src/egl/wayland/wayland-drm/wayland-drm.h:8:41: fatal error: wayland-drm-server-protocol.h: No such file or directory compilation terminated. --- src/egl/

Re: [Mesa-dev] [PATCH] egl_dri2: Fix out of tree builds with the wayland backend enabled

On 05/02/2012 04:04 PM, Robert Hooker wrote: Otherwise it fails like so: CC egl_dri2.lo In file included from egl_dri2.h:40:0, from egl_dri2.c:42: ../../../../../../src/egl/wayland/wayland-drm/wayland-drm.h:8:41: fatal error: wayland-drm-server-protocol.h: No such file o

[Mesa-dev] Conflicts between OES/EXT/ARB_framebuffer_object and GL3.0/GLES2

Mesa has problems in the way it implements glBindFramebuffer and glBindFramebufferEXT due to both being implemented by an overloaded _mesa_BindFramebufferEXT. This problem causes an Android app [1] to crash, and I want your opinion on how we should fix it. The problem is that in the five specs in

Re: [Mesa-dev] [PATCH] egl_dri2: Fix out of tree builds with the wayland backend enabled

On 2012-05-03 02:31 +0200, Kenneth Graunke wrote: > On 05/02/2012 04:04 PM, Robert Hooker wrote: >> Otherwise it fails like so: >> >>CC egl_dri2.lo >> In file included from egl_dri2.h:40:0, >> from egl_dri2.c:42: >> ../../../../../../src/egl/wayland/wayland-drm/wayland-dr

[Mesa-dev] Cannot build mesa with wayland from the 0.85 branch

Hi folks, Building the wayland backend in mesa with wayland from the 0.85 branch fails: , | make[5]: Entering directory `/usr/local/src/deb-src/mesa/mesa/build/dri/src/gallium/state_trackers/egl' | gcc -c -I. -I../../../../src/gallium/include -I../../../../src/gallium/auxiliary -I../../../.