summaryrefslogtreecommitdiff
path: root/src/mesa/main
AgeCommit message (Collapse)Author
2009-11-06mesa: Attempt to pair up Driver.RenderTexture and FinishRenderTexture()Eric Anholt
This is probably not 100% complete (bind vs unbind may still not pair up exactly), but it should help out drivers which are relying on FinishRenderTexture to be called when we're done rendering to a particular texture level, not just when we're done rendering to the object at all. This is the case for the one consumer of FinishRenderTexture() so far: the gallium state tracker. Noticed when trying to make use of FRT() in the intel driver.
2009-11-06Merge branch 'mesa_7_6_branch'Ian Romanick
This should fix the memory leaks in the assembly parser without the regressions. The conflicts in program_lexer.l were related to changes in returning strings between the branches (always return IDENTIFIER vs. returing either IDENTIFIER or USED_IDENTIFIER). The conflicts in program_parse.y were related to two changes in master One change prints a variable name in an error message. The other change adds outputVarSize to the OUTPUT_statement rule. The cause the position of the IDENTIFIER to change from $2 to $3. Conflicts: src/mesa/shader/lex.yy.c src/mesa/shader/program_lexer.l src/mesa/shader/program_parse.tab.c src/mesa/shader/program_parse.y
2009-11-05mesa: fix infinite loop bug in _mesa_drawbuffers()Brian Paul
Fixes bug 24946. This regression came from 8df699b3bb1aa05b633f05b121d09d812c86a22d.
2009-11-04mesa: added cast to silence warningBrian Paul
2009-11-04Merge branch 'mesa_7_6_branch'Brian Paul
Conflicts: src/mesa/drivers/windows/gdi/mesa.def
2009-11-04mesa: fix broken pack_histogram() case for GLhalfBrian Paul
2009-11-04mesa: silence warning from gcc 4.4.1Brian Paul
2009-11-03mesa: (GLint64) casts in get.c to silence Visual Studio warningsBrian Paul
Revised version of a patch from Karl Schultz.
2009-11-03mesa: added GLAPIENTRY keywords for sync object functionsKarl Schultz
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-11-03mesa: clean-up, remove some flushing in FBO functionsBrian Paul
Remove some unneeded flushes. Replace FLUSH_CURRENT w/ FLUSH_VERTICES in other places.
2009-11-03mesa: fix indentationBrian Paul
2009-11-03mesa: clean-up formattingBrian Paul
2009-11-03mesa: avoid extraneous _NEW_BUFFER changes in _mesa_BindFramebufferEXT()Brian Paul
2009-11-03mesa: use FLUSH_VERTICES() in _mesa_drawbuffers()Brian Paul
2009-11-03mesa: avoid extraneous _NEW_BUFFER state in _mesa_drawbuffers()Brian Paul
2009-11-03mesa: use ffs() to shorten loop in _mesa_drawbuffers()Brian Paul
2009-11-03mesa: added assertion, another commentBrian Paul
2009-11-02mesa: added commentBrian Paul
2009-11-02mesa: use _mesa_get_current_tex_object()Brian Paul
2009-11-02mesa: make _mesa_get_current_tex_objec() publicBrian Paul
2009-11-02mesa: fix incorrect approx bits/channel for fxt1 formatsBrian Paul
See bug 24806.
2009-10-30mesa: better error messageBrian Paul
2009-10-30mesa: fix inverted buffer object testBrian Paul
Fixes bug 24799.
2009-10-30mesa: fix incorrect format info for MESA_FORMAT_SL8Brian Paul
Fixes bugs 24798 and 24801.
2009-10-29mesa: fix _mesa_texstore_argb8888() for MESA_FORMAT_XRGB8888Brian Paul
If we hit the general path and call _mesa_make_temp_chan_image() we always want to get a GL_RGBA texture. We were getting a 3-channel GL_RGB texture before and that messed up the memory layout.
2009-10-29mesa: lift memcpy_get_tex_image() code from intel driver into core MesaBrian Paul
The code should work for any driver.
2009-10-29mesa: refactor _mesa_get_teximage() codeBrian Paul
Break different formats into different functions to make it easier to read.
2009-10-29mesa: Add MESA_FORMAT_Z24_X8.José Fonseca
2009-10-29mesa: consolidate some code in _mesa_GetCompressedTexImageARB()Brian Paul
2009-10-29mesa: move pixels==NULL check in glGetTexImage()Brian Paul
2009-10-29mesa: consolidate some code in _mesa_GetTexImage()Brian Paul
2009-10-29mesa: move, clean-up _mesa_print_texture()Brian Paul
2009-10-29mesa: fix some tests in subtexture_error_check2()Brian Paul
Don't use hard-coded compressed block sizes. Update comments and error strings.
2009-10-29mesa: remove unneedded is_srgb_teximage() functionBrian Paul
Use _mesa_get_format_color_encoding() function instead.
2009-10-29glsl: make shader substitution a little betterBrian Paul
2009-10-29mesa: move declaration to prevent unused var warningBrian Paul
2009-10-29mesa: Fix compilation errors and warnings when features are disabled.Chia-I Wu
Some of the fixes are cherry-picked from opengl-es branch. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-10-29mesa/main: Make FEATURE_texture_s3tc follow feature conventions.Chia-I Wu
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-10-29mesa/main: Make FEATURE_texture_fxt1 follow feature conventions.Chia-I Wu
Also remove the unused initialization and GLchan fetch functions. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-10-29mesa/main: Never return NULL in _mesa_get_texstore_func.Chia-I Wu
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-10-28mesa: remove old, unused #defineBrian Paul
2009-10-28mesa: move some gl_texture_image and gl_renderbuffer fields aroundBrian Paul
2009-10-28mesa: minor code movementBrian Paul
2009-10-28Merge branch 'texformat-rework'Brian Paul
Conflicts: src/mesa/drivers/dri/radeon/radeon_fbo.c src/mesa/drivers/dri/s3v/s3v_tex.c src/mesa/drivers/dri/s3v/s3v_xmesa.c src/mesa/drivers/dri/trident/trident_context.c src/mesa/main/debug.c src/mesa/main/mipmap.c src/mesa/main/texformat.c src/mesa/main/texgetimage.c
2009-10-28mesa: choose texture format in _mesa_get_fallback_texture()Brian Paul
2009-10-28Merge branch 'mesa_7_6_branch'Brian Paul
2009-10-28mesa: Fix memory leak if we run out of memoryVinson Lee
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-10-27mesa: consolidate _mesa_CompressedTexSubImage[123]DARB() functionsBrian Paul
2009-10-27mesa: consolidate CompressedTexSubImage1/2/3DARB() error checkingBrian Paul
2009-10-27mesa: simplify teximage code with get_current_tex_object()Brian Paul