OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 #include "gl/GrGLShaderBuilder.h" | 8 #include "gl/GrGLShaderBuilder.h" |
9 #include "gl/GrGLProgram.h" | 9 #include "gl/GrGLProgram.h" |
10 #include "gl/GrGLUniformHandle.h" | 10 #include "gl/GrGLUniformHandle.h" |
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
623 GrGLuint programId, | 623 GrGLuint programId, |
624 GrGLenum type, | 624 GrGLenum type, |
625 const SkString& shaderSrc) { | 625 const SkString& shaderSrc) { |
626 GrGLuint shaderId; | 626 GrGLuint shaderId; |
627 GR_GL_CALL_RET(gli, shaderId, CreateShader(type)); | 627 GR_GL_CALL_RET(gli, shaderId, CreateShader(type)); |
628 if (0 == shaderId) { | 628 if (0 == shaderId) { |
629 return false; | 629 return false; |
630 } | 630 } |
631 | 631 |
632 const GrGLchar* sourceStr = shaderSrc.c_str(); | 632 const GrGLchar* sourceStr = shaderSrc.c_str(); |
633 int sourceLength = shaderSrc.size(); | 633 GrGLint sourceLength = static_cast<GrGLint>(shaderSrc.size()); |
634 GR_GL_CALL(gli, ShaderSource(shaderId, 1, &sourceStr, &sourceLength)); | 634 GR_GL_CALL(gli, ShaderSource(shaderId, 1, &sourceStr, &sourceLength)); |
635 | 635 |
636 GrGLint compiled = GR_GL_INIT_ZERO; | 636 GrGLint compiled = GR_GL_INIT_ZERO; |
637 GR_GL_CALL(gli, CompileShader(shaderId)); | 637 GR_GL_CALL(gli, CompileShader(shaderId)); |
638 GR_GL_CALL(gli, GetShaderiv(shaderId, GR_GL_COMPILE_STATUS, &compiled)); | 638 GR_GL_CALL(gli, GetShaderiv(shaderId, GR_GL_COMPILE_STATUS, &compiled)); |
639 | 639 |
640 if (!compiled) { | 640 if (!compiled) { |
641 GrGLint infoLen = GR_GL_INIT_ZERO; | 641 GrGLint infoLen = GR_GL_INIT_ZERO; |
642 GR_GL_CALL(gli, GetShaderiv(shaderId, GR_GL_INFO_LOG_LENGTH, &infoLen)); | 642 GR_GL_CALL(gli, GetShaderiv(shaderId, GR_GL_INFO_LOG_LENGTH, &infoLen)); |
643 SkAutoMalloc log(sizeof(char)*(infoLen+1)); // outside if for debugger | 643 SkAutoMalloc log(sizeof(char)*(infoLen+1)); // outside if for debugger |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
950 GrGLSLExpr<4>* inOutFSColor) { | 950 GrGLSLExpr<4>* inOutFSColor) { |
951 | 951 |
952 GrGLTexGenProgramEffectsBuilder texGenEffectsBuilder(this, effectCnt); | 952 GrGLTexGenProgramEffectsBuilder texGenEffectsBuilder(this, effectCnt); |
953 this->INHERITED::createAndEmitEffects(&texGenEffectsBuilder, | 953 this->INHERITED::createAndEmitEffects(&texGenEffectsBuilder, |
954 effectStages, | 954 effectStages, |
955 effectKeys, | 955 effectKeys, |
956 effectCnt, | 956 effectCnt, |
957 inOutFSColor); | 957 inOutFSColor); |
958 return texGenEffectsBuilder.finish(); | 958 return texGenEffectsBuilder.finish(); |
959 } | 959 } |
OLD | NEW |