diff options
| author | Brian Paul <brianp@vmware.com> | 2009-05-11 16:27:50 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-05-11 16:27:50 -0600 |
| commit | e7cb125b2d9e9c7b1ad89b988fa3bf53ead9eb0c (patch) | |
| tree | b47a363853d2ed59184c3b9eb72ccb30d00cbebf /src/gallium | |
| parent | 783e43064b64feb87e0457f96c2275160389f84c (diff) | |
| parent | f104e4d666dfccda6f5ad817693216733ddede44 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
src/mesa/main/version.h
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/state_trackers/wgl/shared/stw_device.h | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/drm/intel/dri/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/wgl/shared/stw_device.h b/src/gallium/state_trackers/wgl/shared/stw_device.h index 969e3843e7..e097f1f71e 100644 --- a/src/gallium/state_trackers/wgl/shared/stw_device.h +++ b/src/gallium/state_trackers/wgl/shared/stw_device.h @@ -37,7 +37,7 @@ #include "stw_pixelformat.h" -#define STW_MAX_PIXELFORMATS 128 +#define STW_MAX_PIXELFORMATS 256 struct pipe_screen; diff --git a/src/gallium/winsys/drm/intel/dri/Makefile b/src/gallium/winsys/drm/intel/dri/Makefile index a4704bc050..ac0891a646 100644 --- a/src/gallium/winsys/drm/intel/dri/Makefile +++ b/src/gallium/winsys/drm/intel/dri/Makefile @@ -21,5 +21,5 @@ include ../../Makefile.template DRI_LIB_DEPS += -ldrm_intel symlinks: $(TOP)/$(LIB_DIR)/gallium - @rm -f $(TOP)/lib/gallium/i965_dri.so - ln -s i915_dri.so $(TOP)/lib/gallium/i965_dri.so + @rm -f $(TOP)/$(LIB_DIR)/gallium/i965_dri.so + ln -s i915_dri.so $(TOP)/$(LIB_DIR)/gallium/i965_dri.so |