Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mesa: add missing cases for texture array targets | Brian Paul | 2008-12-17 | 1 | -6/+10 |
| | |||||
* | Revert "mesa: fix vertex program test in get_fp_input_mask()" | Brian Paul | 2008-12-17 | 1 | -1/+3 |
| | | | | | | This reverts commit 8dc88cb64305c591dfadded2b5acbb1e6b04cd7f. This change broke other things... | ||||
* | mesa: fix vertex program test in get_fp_input_mask() | Brian Paul | 2008-12-17 | 1 | -3/+1 |
| | | | | | We were accidentally using the fixed-function logic when a vertex shader was being used. | ||||
* | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-12-16 | 4 | -72/+146 |
|\ | |||||
| * | mesa: move _mesa_dlopen(), etc into separate dlopen.c file | Brian Paul | 2008-12-15 | 4 | -72/+146 |
| | | |||||
* | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-12-15 | 1 | -0/+12 |
|\| | |||||
| * | Perform range checking on app supplied texture base level | Ian Romanick | 2008-12-14 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | It is possible for applications to specify any texture base level, including trivially invalid values (i.e., 47000000). When an app specifies an invalide base level, we should gracefully disable the texture instead of accessing memory outside the gl_texture_object. This fixes an occasional segfault in one of our conformance tests. | ||||
* | | mesa: fixes for srgb, new srgb formats | Roland Scheidegger | 2008-12-12 | 7 | -54/+358 |
| | | | | | | | | | | | | | | | | | | | | | | add some more srgb texture formats, including compressed ones various fixes relating to srgb formats issues: _mesa_get_teximage is completely broken for srgb textures, both for non-compressed ones (swizzling) and compressed ones (shouldn't do standard-to-linear conversion) texelFetch function may be broken for little or big endian (or both...) | ||||
* | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-12-09 | 1 | -2/+10 |
|\| | |||||
| * | mesa: Fix GenerateMipmapEXT(GL_TEXTURE_CUBE_MAP_ARB). | Eric Anholt | 2008-12-06 | 1 | -2/+10 |
| | | | | | | | | | | | | The ctx->Driver.GenerateMipmap() hook only expects cubemap face enums, not CUBE_MAP_ARB, so walk all faces when we encounter that. Fixes oglconform fbo.c segfault with both swrast and i965 drivers. | ||||
* | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-12-08 | 3 | -8/+11 |
|\| | | | | | | | | | | | Conflicts: progs/glsl/Makefile | ||||
| * | mesa: fix conditional in save_Lightfv(), bug 18838 | Brian | 2008-12-01 | 1 | -1/+1 |
| | | |||||
| * | mesa: enable texture compression extensions for software drivers when possible | Brian Paul | 2008-11-28 | 1 | -1/+10 |
| | | |||||
| * | mesa: remove unneeded compressed texure size checks | Phillip Klaus Krause | 2008-11-28 | 1 | -6/+0 |
| | | |||||
* | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-11-24 | 2 | -0/+5 |
|\| | | | | | | | | | | | Conflicts: progs/glsl/Makefile | ||||
| * | mesa: add gl_program::Input/OutputFlags[] array | Brian Paul | 2008-11-24 | 2 | -0/+5 |
| | | | | | | | | | | These arrays will indicate per-input or per-output options for vertex/fragment programs such as centroid-sampling and invariance. | ||||
* | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-11-20 | 3 | -3/+16 |
|\| | |||||
| * | mesa: fix shadow sampling unit issue. | Xiang, Haihao | 2008-11-20 | 1 | -1/+6 |
| | | | | | | | | | | texture comparison logic is bypassed if the currently bound texture is not a depth/depth_stencil texture. | ||||
| * | mesa: clamp luminance if needed. | Xiang, Haihao | 2008-11-19 | 2 | -2/+10 |
| | | | | | | | | | | This fixes glReadPixels(GL_LUMINANCE, GL_FLOAT)/glGetTexImage(GL_LUMINANCE, GL_FLOAT) issue on fixed-point color buffers. | ||||
| * | mesa: fix generation of fixed function state when no vp exists | Alan Hourihane | 2008-11-13 | 1 | -43/+41 |
| | | |||||
* | | mesa: fix generation of fixed function state when no vp exists | Alan Hourihane | 2008-11-13 | 1 | -43/+41 |
| | | |||||
* | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-11-11 | 8 | -30/+52 |
|\| | | | | | | | | | | | | | Conflicts: src/mesa/shader/prog_execute.c src/mesa/shader/slang/library/slang_vertex_builtin_gc.h | ||||
| * | mesa: restore the negate flag of dots in build_lighting. | Xiang, Haihao | 2008-11-11 | 1 | -0/+3 |
| | | | | | | | | | | Dots is re-used if more than one light is enabled. Previously the negate flag of dots may affect next light. | ||||
| * | mesa: update new state for RasterPos like other operations. | Xiang, Haihao | 2008-11-11 | 1 | -3/+3 |
| | | | | | | | | This fixes a lighting issue when drawing a bitmap. | ||||
| * | mesa: new _mesa_is_pow_two() function | Brian | 2008-11-10 | 5 | -23/+33 |
| | | |||||
| * | mesa: fix some misc breakage caused by editing auto-generated files rather ↵ | Brian Paul | 2008-11-10 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | than the python generators Specifically: #include "glapitable.h" in src/mesa/main/glapi/dispatch.h Call _mesa_bsearch() in src/mesa/main/enums.c. | ||||
| * | GLX: fix out-of-bounds memory issue in indirect glAreTexturesResident() | Brian Paul | 2008-11-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See bug 18445. When getting array results, __glXReadReply() always reads a multiple of four bytes. This can cause writing to invalid memory when 'n' is not a multiple of four. Special-case the glAreTexturesResident() functions now. To fix the bug, we use a temporary buffer that's a multiple of four bytes in length. NOTE: this commit also reverts part of commit 919ec22ecf72aa163e1b97d8c7381002131ed32c (glx/x11: Added some #ifdef GLX_DIRECT_RENDERING protection) which directly edited the indirect.c file rather than the python generator! I'm not repairing that issue at this time. | ||||
| * | mesa: use NRM3 in emit_normalize_vec3() when drivers are ready | Brian | 2008-11-08 | 1 | -0/+5 |
| | | |||||
* | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-11-07 | 1 | -3/+2 |
|\| | |||||
| * | mesa: use _bfc0 instead of _col0 when building back face lighting. | Xiang, Haihao | 2008-11-07 | 1 | -3/+2 |
| | | |||||
* | | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Brian Paul | 2008-11-05 | 1 | -0/+12 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/rtasm/rtasm_execmem.c src/mesa/shader/slang/slang_emit.c src/mesa/shader/slang/slang_log.c src/mesa/state_tracker/st_atom_framebuffer.c | ||||
| * | | mesa: additional debug flags for glsl debug/disassembly | Brian Paul | 2008-11-01 | 2 | -30/+28 |
| | | | |||||
| * | | mesa: note that texcoords are generated by setup routines when pointsprite ↵ | Keith Whitwell | 2008-10-20 | 1 | -0/+12 |
| | | | | | | | | | | | | enabled | ||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-11-01 | 3 | -31/+29 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: src/mesa/shader/slang/library/slang_vertex_builtin_gc.h | ||||
| * | | mesa: additional debug flags for glsl debug/disassembly | Brian Paul | 2008-11-01 | 2 | -30/+28 |
| | | | |||||
| * | | mesa: fix a typo in the previous commit | Xiang, Haihao | 2008-10-31 | 1 | -1/+1 |
| | | | |||||
| * | | mesa: fix an issue in _mesa_PointParameterfv(). | Xiang, Haihao | 2008-10-30 | 1 | -1/+1 |
| | | | |||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-10-27 | 4 | -88/+82 |
|\| | | |||||
| * | | mesa: remove calls to _mesa_adjust_image_for_convolution(), use texImage fields | Brian Paul | 2008-10-23 | 1 | -14/+6 |
| | | | | | | | | | | | | The texImage->Width/Height fields will have the post-convolution width/height. | ||||
| * | | mesa: move convolution image adjustment code for glCopyTexSubImage1/2/3D() | Brian Paul | 2008-10-22 | 1 | -15/+21 |
| | | | | | | | | | | | | Do it after initial error checking, after we know the texture's internal format. | ||||
| * | | mesa: some re-org of glCopyTexSubImage1/2/3D() error checking | Brian Paul | 2008-10-22 | 1 | -33/+32 |
| | | | |||||
| * | | mesa: in textore.c, only adjust image for convolution if image is a color format | Brian Paul | 2008-10-22 | 3 | -14/+20 |
| | | | | | | | | | | | | | | | Makes things consistant with the code in teximage.c. We only want to apply convolution to color formats (not depth/index formats) | ||||
| * | | mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861 | Brian Paul | 2008-10-16 | 1 | -15/+6 |
| | | | |||||
* | | | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Keith Whitwell | 2008-10-15 | 6 | -41/+92 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: src/mesa/main/context.c | ||||
| * | | mesa: modify fixed function vertex programs not to reference constant attributes | Keith Whitwell | 2008-10-14 | 2 | -30/+41 |
| | | | |||||
| * | | mesa: new _mesa_set_vp_override() function for driver-override of vertex program | Brian Paul | 2008-10-10 | 4 | -11/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | Patch provide by Keith. Used in state tracker by DrawPixels to indicate that the state tracker (driver) is using its own vertex program. This prevents the texenvprogram code from replacing conventional shader inputs with state vars. Fixes glDraw/CopyPixels regressions. | ||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-10-10 | 7 | -57/+34 |
|\ \ \ | | |/ | |/| | |||||
| * | | mesa: fix asst. issues in _mesa_texstore_argb8888() | Brian Paul | 2008-10-10 | 1 | -40/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | If we shift bytes into the texel word (or use the PACK_COLOR_8888 macro), we don't have to worry about big vs. little endian. See comments about texel formats in texformat.h. Remove an unneeded/incorrect else-if clause that produced wrong results on big-endian systems. | ||||
| * | | mesa: remove unneeded includes | Brian Paul | 2008-10-10 | 2 | -2/+0 |
| | | | |||||
| * | | mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861 | Brian Paul | 2008-10-10 | 1 | -1/+12 |
| | | |