Merged with master

Olivier Prat committed 8 years ago

Commit f5a25572 parents 92e1fe8 0ef27941213 files · +53263 −55587Browse files

Showing the changes to libraries/render/src/render/DrawStatus.cpp (1 of 1213 files). Show all

Unified · Split

libraries/render/src/render/DrawStatus.cpp+4−4

@@ -35,8 +35,8 @@ void DrawStatusConfig::dirtyHelper() { · 34 unmodified lines
35		35
36	const gpu::PipelinePointer DrawStatus::getDrawItemBoundsPipeline() {	36	const gpu::PipelinePointer DrawStatus::getDrawItemBoundsPipeline() {
37	if (!_drawItemBoundsPipeline) {	37	if (!_drawItemBoundsPipeline) {
38	auto vs = gpu::Shader::createVertex(std::string(drawItemBounds_vert));	38	auto vs = drawItemBounds_vert::getShader();
39	auto ps = gpu::Shader::createPixel(std::string(drawItemBounds_frag));	39	auto ps = drawItemBounds_frag::getShader();
40	gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);	40	gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
41		41
42	gpu::Shader::BindingSet slotBindings;	42	gpu::Shader::BindingSet slotBindings;
@@ -63,8 +63,8 @@ const gpu::PipelinePointer DrawStatus::getDrawItemBoundsPipeline() { · 20 unmodified lines
63		63
64	const gpu::PipelinePointer DrawStatus::getDrawItemStatusPipeline() {	64	const gpu::PipelinePointer DrawStatus::getDrawItemStatusPipeline() {
65	if (!_drawItemStatusPipeline) {	65	if (!_drawItemStatusPipeline) {
66	auto vs = gpu::Shader::createVertex(std::string(drawItemStatus_vert));	66	auto vs = drawItemStatus_vert::getShader();
67	auto ps = gpu::Shader::createPixel(std::string(drawItemStatus_frag));	67	auto ps = drawItemStatus_frag::getShader();
68	gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);	68	gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
69		69
70	gpu::Shader::BindingSet slotBindings;	70	gpu::Shader::BindingSet slotBindings;