diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-18 11:02:46 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-18 11:02:46 +1100 |
| commit | 015871a0753cb984f8a93232a7e8334a24b08406 (patch) | |
| tree | c5123bee6f600fbe44f15b77321fb9f60aea5392 /src/mesa/pipe/i965simple/brw_state_upload.c | |
| parent | c5ffd8e9afd3df1d4daf189344ec8cbf8a021143 (diff) | |
| parent | 04a5a8b3bcba64c506ee5646a3a8b737e124a66a (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'src/mesa/pipe/i965simple/brw_state_upload.c')
| -rw-r--r-- | src/mesa/pipe/i965simple/brw_state_upload.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/pipe/i965simple/brw_state_upload.c b/src/mesa/pipe/i965simple/brw_state_upload.c index 1fb480172d..2502e54929 100644 --- a/src/mesa/pipe/i965simple/brw_state_upload.c +++ b/src/mesa/pipe/i965simple/brw_state_upload.c @@ -90,8 +90,7 @@ const struct brw_tracked_state *atoms[] = &brw_psp_urb_cbs, - - NULL, /* brw_constant_buffer */ + &brw_constant_buffer }; |