diff options
| author | Marek Olšák <maraeo@gmail.com> | 2012-05-11 16:38:13 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2012-05-11 16:38:13 +0200 |
| commit | bb4c5d72d7c7cb1d9e7016e2c07c36875f30011a (patch) | |
| tree | 153444ff535900f82ae63b5af8ccd09fb2f063af /src/gallium/state_trackers/d3d1x | |
| parent | 96956dc5076fc03b9290368ca90e3f3b870ee613 (diff) | |
| parent | 8dd3e341b337ca2d22bcc0e7548a78a6c36ca77d (diff) | |
Merge branch 'gallium-userbuf'
Conflicts:
src/gallium/docs/source/screen.rst
src/gallium/drivers/nv50/nv50_state.c
src/gallium/include/pipe/p_defines.h
src/mesa/state_tracker/st_draw.c
Diffstat (limited to 'src/gallium/state_trackers/d3d1x')
| -rw-r--r-- | src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h index d5c366ffd4f..a7b761c707f 100644 --- a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h +++ b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h @@ -344,7 +344,7 @@ struct GalliumD3D10Device : public GalliumD3D10ScreenImpl<threadsafe> { constant_buffers[s][start + i] = constbufs[i]; if(s < caps.stages && start + i < caps.constant_buffers[s]) - pipe->set_constant_buffer(pipe, s, start + i, constbufs[i] ? constbufs[i]->resource : NULL); + pipe_set_constant_buffer(pipe, s, start + i, constbufs[i] ? constbufs[i]->resource : NULL); } } } @@ -1715,7 +1715,7 @@ struct GalliumD3D10Device : public GalliumD3D10ScreenImpl<threadsafe> { unsigned num = std::min(caps.constant_buffers[s], (unsigned)D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT); for(unsigned i = 0; i < num; ++i) - pipe->set_constant_buffer(pipe, s, i, constant_buffers[s][i].p ? constant_buffers[s][i].p->resource : 0); + pipe_set_constant_buffer(pipe, s, i, constant_buffers[s][i].p ? constant_buffers[s][i].p->resource : 0); } update_flags |= (1 << (UPDATE_SAMPLERS_SHIFT + D3D11_STAGE_VS)) | (1 << (UPDATE_VIEWS_SHIFT + D3D11_STAGE_VS)); @@ -1961,7 +1961,7 @@ struct GalliumD3D10Device : public GalliumD3D10ScreenImpl<threadsafe> if(constant_buffers[s][i] == buffer) { constant_buffers[s][i] = (ID3D10Buffer*)NULL; - pipe->set_constant_buffer(pipe, s, i, NULL); + pipe_set_constant_buffer(pipe, s, i, NULL); } } } |